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

Alex Shi · Alex Shi · commit 9fd33d009e8c · 2017-05-26T13:55:23.000+08:00
diff --git 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
