diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-26 13:55:23 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-26 13:55:23 +0800 |
| commit | 9fd33d009e8cc0363961601fcdf4eeae1ce624d7 (patch) | |
| tree | a1d52a15d00c4d81504b918210ff569776ef7ab9 | |
| parent | be8cec38166830bd968b13389b8b22da6913f439 (diff) | |
| parent | 4479455fd82c11d4ffa1438b1b8b928cdb1da868 (diff) | |
Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4lsk-v4.4-17.05
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 82bff5734ac0..6fba73b6fcc8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -548,6 +548,7 @@ source kernel/Kconfig.preempt source kernel/Kconfig.hz config ARCH_SUPPORTS_DEBUG_PAGEALLOC + depends on !HIBERNATION def_bool y config ARCH_HAS_HOLES_MEMORYMODEL |