lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] swsusp: clean up suspend header

Browse Source 
Remove some things that are no longer used or defined elsewhere from suspend.h
and make the inline version of software_suspend() return the right error code.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Rafael J. Wysocki
2006-09-25 23:32:51 -07:00
committed by Linus Torvalds
parent cd560bb2f9
commit dcbb5a54f6
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/suspend.h
View File

@@ -10,11 +10,11 @@
#include <linux/pm.h> #include <linux/pm.h>
/* page backup entry */ /* page backup entry */
typedef struct pbe { struct pbe {
unsigned long address; /* address of the copy */ unsigned long address; /* address of the copy */
unsigned long orig_address; /* original address of page */ unsigned long orig_address; /* original address of page */
struct pbe *next; struct pbe *next;
} suspend_pagedir_t; };
#define for_each_pbe(pbe, pblist) \ #define for_each_pbe(pbe, pblist) \
for (pbe = pblist ; pbe ; pbe = pbe->next) for (pbe = pblist ; pbe ; pbe = pbe->next)
@@ -25,15 +25,6 @@ typedef struct pbe {
#define for_each_pb_page(pbe, pblist) \ #define for_each_pb_page(pbe, pblist) \
for (pbe = pblist ; pbe ; pbe = (pbe+PB_PAGE_SKIP)->next) for (pbe = pblist ; pbe ; pbe = (pbe+PB_PAGE_SKIP)->next)
#define SWAP_FILENAME_MAXLENGTH 32
extern dev_t swsusp_resume_device;
/* mm/vmscan.c */
extern int shrink_mem(void);
/* mm/page_alloc.c */ /* mm/page_alloc.c */
extern void drain_local_pages(void); extern void drain_local_pages(void);
extern void mark_free_pages(struct zone *zone); extern void mark_free_pages(struct zone *zone);
@@ -53,7 +44,7 @@ static inline void pm_restore_console(void) {}
static inline int software_suspend(void) static inline int software_suspend(void)
{ {
printk("Warning: fake suspend called\n"); printk("Warning: fake suspend called\n");
return -EPERM; return -ENOSYS;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */