git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
suspend.h
diff --git
a/include/linux/suspend.h
b/include/linux/suspend.h
index
2bf0d5f
..
37c1c76
100644
(file)
--- a/
include/linux/suspend.h
+++ b/
include/linux/suspend.h
@@
-14,11
+14,7
@@
typedef struct pbe {
unsigned long address; /* address of the copy */
unsigned long orig_address; /* original address of page */
typedef struct pbe {
unsigned long address; /* address of the copy */
unsigned long orig_address; /* original address of page */
- swp_entry_t swap_address;
-
- struct pbe *next; /* also used as scratch space at
- * end of page (see link, diskpage)
- */
+ struct pbe *next;
} suspend_pagedir_t;
#define for_each_pbe(pbe, pblist) \
} suspend_pagedir_t;
#define for_each_pbe(pbe, pblist) \
@@
-47,18
+43,22
@@
extern void mark_free_pages(struct zone *zone);
/* kernel/power/swsusp.c */
extern int software_suspend(void);
/* kernel/power/swsusp.c */
extern int software_suspend(void);
+#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
extern int pm_prepare_console(void);
extern void pm_restore_console(void);
extern int pm_prepare_console(void);
extern void pm_restore_console(void);
-
+#else
+static inline int pm_prepare_console(void) { return 0; }
+static inline void pm_restore_console(void) {}
+#endif /* defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) */
#else
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -EPERM;
}
#else
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -EPERM;
}
-#endif
+#endif
/* CONFIG_PM */
-#ifdef CONFIG_SMP
+#ifdef CONFIG_S
USPEND_S
MP
extern void disable_nonboot_cpus(void);
extern void enable_nonboot_cpus(void);
#else
extern void disable_nonboot_cpus(void);
extern void enable_nonboot_cpus(void);
#else
@@
-71,5
+71,12
@@
void restore_processor_state(void);
struct saved_context;
void __save_processor_state(struct saved_context *ctxt);
void __restore_processor_state(struct saved_context *ctxt);
struct saved_context;
void __save_processor_state(struct saved_context *ctxt);
void __restore_processor_state(struct saved_context *ctxt);
+unsigned long get_safe_page(gfp_t gfp_mask);
+
+/*
+ * XXX: We try to keep some more pages free so that I/O operations succeed
+ * without paging. Might this be more?
+ */
+#define PAGES_FOR_IO 1024
#endif /* _LINUX_SWSUSP_H */
#endif /* _LINUX_SWSUSP_H */