diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 17:24:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:45:38 -0400 |
| commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
| tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/x86_64/kernel/suspend.c | |
| parent | 6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff) | |
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid
confusion (among other things, with CONFIG_SUSPEND introduced in the
next patch).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/suspend.c')
| -rw-r--r-- | arch/x86_64/kernel/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c index ea83a9f91965..573c0a6e0ac6 100644 --- a/arch/x86_64/kernel/suspend.c +++ b/arch/x86_64/kernel/suspend.c | |||
| @@ -146,7 +146,7 @@ void fix_processor_context(void) | |||
| 146 | 146 | ||
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | #ifdef CONFIG_SOFTWARE_SUSPEND | 149 | #ifdef CONFIG_HIBERNATION |
| 150 | /* Defined in arch/x86_64/kernel/suspend_asm.S */ | 150 | /* Defined in arch/x86_64/kernel/suspend_asm.S */ |
| 151 | extern int restore_image(void); | 151 | extern int restore_image(void); |
| 152 | 152 | ||
| @@ -236,4 +236,4 @@ int pfn_is_nosave(unsigned long pfn) | |||
| 236 | unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT; | 236 | unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT; |
| 237 | return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); | 237 | return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); |
| 238 | } | 238 | } |
| 239 | #endif /* CONFIG_SOFTWARE_SUSPEND */ | 239 | #endif /* CONFIG_HIBERNATION */ |