mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
6c8dca5d53
commit
b0cb1a19d0
33 changed files with 47 additions and 47 deletions
|
|
@ -425,7 +425,7 @@ void free_swap_and_cache(swp_entry_t entry)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SOFTWARE_SUSPEND
|
||||
#ifdef CONFIG_HIBERNATION
|
||||
/*
|
||||
* Find the swap type that corresponds to given device (if any).
|
||||
*
|
||||
|
|
@ -951,7 +951,7 @@ sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SOFTWARE_SUSPEND
|
||||
#ifdef CONFIG_HIBERNATION
|
||||
/*
|
||||
* Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
|
||||
* corresponding to given index in swap_info (swap type).
|
||||
|
|
@ -966,7 +966,7 @@ sector_t swapdev_block(int swap_type, pgoff_t offset)
|
|||
sis = swap_info + swap_type;
|
||||
return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0;
|
||||
}
|
||||
#endif /* CONFIG_SOFTWARE_SUSPEND */
|
||||
#endif /* CONFIG_HIBERNATION */
|
||||
|
||||
/*
|
||||
* Free all of a swapdev's extent information
|
||||
|
|
|
|||
Loading…
Reference in a new issue