From b8855f602d42b91b109bf89742b90c325ea6c4e4 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 25 Sep 2006 23:32:51 -0700 Subject: [PATCH] --- yaml --- r: 35687 b: refs/heads/master c: dcbb5a54f6e3984efa24772394f2225b11495c55 h: refs/heads/master i: 35685: cd31ee07fb28b581859647ea93eca0589869373a 35683: 60bf0f4204d101343ffa5543cbdc94cac80b9159 35679: dfacf56c456e1884ef088627b4d6f237e9e15e6a v: v3 --- [refs] | 2 +- trunk/include/linux/suspend.h | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index a63d14a2c84b..2b0953a3ade3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd560bb2f9e2cd451bb3942af43da19632ba4a8e +refs/heads/master: dcbb5a54f6e3984efa24772394f2225b11495c55 diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h index 6e8a06c950f4..c11cacf1a13b 100644 --- a/trunk/include/linux/suspend.h +++ b/trunk/include/linux/suspend.h @@ -10,11 +10,11 @@ #include /* 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 */