aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-09-26 02:32:51 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:49:00 -0400
commitdcbb5a54f6e3984efa24772394f2225b11495c55 (patch)
tree60a3877a9f6b23ae42509773b93256c28329af59
parentcd560bb2f9e2cd451bb3942af43da19632ba4a8e (diff)
[PATCH] swsusp: clean up suspend header
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>
-rw-r--r--include/linux/suspend.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 6e8a06c950f4..c11cacf1a13b 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -10,11 +10,11 @@
10#include <linux/pm.h> 10#include <linux/pm.h>
11 11
12/* page backup entry */ 12/* page backup entry */
13typedef struct pbe { 13struct pbe {
14 unsigned long address; /* address of the copy */ 14 unsigned long address; /* address of the copy */
15 unsigned long orig_address; /* original address of page */ 15 unsigned long orig_address; /* original address of page */
16 struct pbe *next; 16 struct pbe *next;
17} suspend_pagedir_t; 17};
18 18
19#define for_each_pbe(pbe, pblist) \ 19#define for_each_pbe(pbe, pblist) \
20 for (pbe = pblist ; pbe ; pbe = pbe->next) 20 for (pbe = pblist ; pbe ; pbe = pbe->next)
@@ -25,15 +25,6 @@ typedef struct pbe {
25#define for_each_pb_page(pbe, pblist) \ 25#define for_each_pb_page(pbe, pblist) \
26 for (pbe = pblist ; pbe ; pbe = (pbe+PB_PAGE_SKIP)->next) 26 for (pbe = pblist ; pbe ; pbe = (pbe+PB_PAGE_SKIP)->next)
27 27
28
29#define SWAP_FILENAME_MAXLENGTH 32
30
31
32extern dev_t swsusp_resume_device;
33
34/* mm/vmscan.c */
35extern int shrink_mem(void);
36
37/* mm/page_alloc.c */ 28/* mm/page_alloc.c */
38extern void drain_local_pages(void); 29extern void drain_local_pages(void);
39extern void mark_free_pages(struct zone *zone); 30extern void mark_free_pages(struct zone *zone);
@@ -53,7 +44,7 @@ static inline void pm_restore_console(void) {}
53static inline int software_suspend(void) 44static inline int software_suspend(void)
54{ 45{
55 printk("Warning: fake suspend called\n"); 46 printk("Warning: fake suspend called\n");
56 return -EPERM; 47 return -ENOSYS;
57} 48}
58#endif /* CONFIG_PM */ 49#endif /* CONFIG_PM */
59 50