diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-09-25 23:32:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:49:00 -0700 |
| commit | dcbb5a54f6e3984efa24772394f2225b11495c55 (patch) | |
| tree | 60a3877a9f6b23ae42509773b93256c28329af59 | |
| parent | cd560bb2f9e2cd451bb3942af43da19632ba4a8e (diff) | |
| download | linux-3.10-dcbb5a54f6e3984efa24772394f2225b11495c55.tar.gz linux-3.10-dcbb5a54f6e3984efa24772394f2225b11495c55.tar.bz2 linux-3.10-dcbb5a54f6e3984efa24772394f2225b11495c55.zip | |
[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.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 6e8a06c950f..c11cacf1a13 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -10,11 +10,11 @@ #include <linux/pm.h> /* page backup entry */ -typedef struct pbe { +struct pbe { unsigned long address; /* address of the copy */ unsigned long orig_address; /* original address of page */ struct pbe *next; -} suspend_pagedir_t; +}; #define for_each_pbe(pbe, pblist) \ for (pbe = pblist ; pbe ; pbe = pbe->next) @@ -25,15 +25,6 @@ typedef struct pbe { #define for_each_pb_page(pbe, pblist) \ 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 */ extern void drain_local_pages(void); 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) { printk("Warning: fake suspend called\n"); - return -EPERM; + return -ENOSYS; } #endif /* CONFIG_PM */ |