GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION

Browse source 
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>
This commit is contained in:
Rafael J. Wysocki 2007-07-29 23:24:36 +02:00 • committed by Linus Torvalds
parent 6c8dca5d53
commit b0cb1a19d0
33 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/asm-i386/e820.h
View file

@ -47,7 +47,7 @@ extern void e820_register_memory(void);
extern void limit_regions(unsigned long long size);
extern void print_memory_map(char *who);
#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
extern void e820_mark_nosave_regions(void);
#else
static inline void e820_mark_nosave_regions(void)

8
include/linux/suspend.h
View file

@ -55,7 +55,7 @@ struct hibernation_ops {
};
#ifdef CONFIG_PM
#ifdef CONFIG_SOFTWARE_SUSPEND
#ifdef CONFIG_HIBERNATION
/* kernel/power/snapshot.c */
extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
static inline void register_nosave_region(unsigned long b, unsigned long e)
@ -73,14 +73,14 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
extern void hibernation_set_ops(struct hibernation_ops *ops);
extern int hibernate(void);
#else /* CONFIG_SOFTWARE_SUSPEND */
#else /* CONFIG_HIBERNATION */
static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
static inline void swsusp_set_page_free(struct page *p) {}
static inline void swsusp_unset_page_free(struct page *p) {}
static inline void hibernation_set_ops(struct hibernation_ops *ops) {}
static inline int hibernate(void) { return -ENOSYS; }
#endif /* CONFIG_SOFTWARE_SUSPEND */
#endif /* CONFIG_HIBERNATION */
void save_processor_state(void);
void restore_processor_state(void);
@ -121,7 +121,7 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)
#define pm_notifier(fn, pri) do { (void)(fn); } while (0)
#endif /* CONFIG_PM */
#if !defined CONFIG_SOFTWARE_SUSPEND || !defined(CONFIG_PM)
#if !defined CONFIG_HIBERNATION || !defined(CONFIG_PM)
static inline void register_nosave_region(unsigned long b, unsigned long e)
{
}