diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-09-07 23:07:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:09:20 -0700 |
| commit | 9f1ab7af88fe9858c3c90eef44b0cc62b98c264e (patch) | |
| tree | bfd65d9b25ef6054d37d073bc9f545bdda17ab79 /kernel | |
| parent | 794fa47369dbc7670cef5dc6c3d9057ccc0797a6 (diff) | |
unknown changes from android-tegra-nv-3.4
Rebase-Id: R940fad74c7e91ef3d1d3d589a48064ccb7335541
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 12 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index f8cc6c43efec..5dd99f7b0ff7 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -83,20 +83,20 @@ config PM_STD_PARTITION default "" ---help--- The default resume partition is the partition that the suspend- - to-disk implementation will look for a suspended disk image. + to-disk implementation will look for a suspended disk image. - The partition specified here will be different for almost every user. + The partition specified here will be different for almost every user. It should be a valid swap partition (at least for now) that is turned - on before suspending. + on before suspending. The partition specified can be overridden by specifying: - resume=/dev/<other device> + resume=/dev/<other device> - which will set the resume partition to the device specified. + which will set the resume partition to the device specified. Note there is currently not a way to specify which device to save the - suspended image to. It will simply pick the first available swap + suspended image to. It will simply pick the first available swap device. config PM_SLEEP diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index baeeb5c87cf1..c1aae6ab4653 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1640,6 +1640,7 @@ ktime_t ktime_get_monotonic_offset(void) } EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset); + /** * do_adjtimex() - Accessor function to NTP __do_adjtimex function */ |