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
vserver 1.9.3
[linux-2.6.git]
/
include
/
linux
/
suspend.h
diff --git
a/include/linux/suspend.h
b/include/linux/suspend.h
index
d0955f0
..
932dc2c
100644
(file)
--- a/
include/linux/suspend.h
+++ b/
include/linux/suspend.h
@@
-23,16
+23,6
@@
typedef struct pbe {
#define SWAP_FILENAME_MAXLENGTH 32
#define SWAP_FILENAME_MAXLENGTH 32
-struct suspend_header {
- u32 version_code;
- unsigned long num_physpages;
- char machine[8];
- char version[20];
- int num_cpus;
- int page_size;
- suspend_pagedir_t *suspend_pagedir;
- unsigned int num_pbes;
-};
#define SUSPEND_PD_PAGES(x) (((x)*sizeof(struct pbe))/PAGE_SIZE+1)
#define SUSPEND_PD_PAGES(x) (((x)*sizeof(struct pbe))/PAGE_SIZE+1)
@@
-45,16
+35,12
@@
extern void drain_local_pages(void);
/* kernel/power/swsusp.c */
extern int software_suspend(void);
/* kernel/power/swsusp.c */
extern int software_suspend(void);
-extern unsigned int nr_copy_pages __nosavedata;
-extern suspend_pagedir_t *pagedir_nosave __nosavedata;
-
#else /* CONFIG_SOFTWARE_SUSPEND */
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -EPERM;
}
#else /* CONFIG_SOFTWARE_SUSPEND */
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -EPERM;
}
-#define software_resume() do { } while(0)
#endif /* CONFIG_SOFTWARE_SUSPEND */
#endif /* CONFIG_SOFTWARE_SUSPEND */
@@
-78,12
+64,6
@@
static inline void disable_nonboot_cpus(void) {}
static inline void enable_nonboot_cpus(void) {}
#endif
static inline void enable_nonboot_cpus(void) {}
#endif
-asmlinkage void do_magic(int is_resume);
-asmlinkage void do_magic_resume_1(void);
-asmlinkage void do_magic_resume_2(void);
-asmlinkage void do_magic_suspend_1(void);
-asmlinkage void do_magic_suspend_2(void);
-
void save_processor_state(void);
void restore_processor_state(void);
struct saved_context;
void save_processor_state(void);
void restore_processor_state(void);
struct saved_context;