Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 82bff5734ac09c2bab646672a9293d4b2d67c8db..6fba73b6fcc876479143df24a11f79459d0997c8 100644 (file)
--- 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