Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

1 files changed, 10 insertions, 26 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 182743b46e0a..209557c9ef17 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -23,9 +23,6 @@ config MMU
 config GENERIC_CMOS_UPDATE
         def_bool y
 
-config GENERIC_TIME
-        def_bool y
-
 config GENERIC_TIME_VSYSCALL
         def_bool y
 
@@ -114,6 +111,8 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
         bool
         default y
+        select OF
+        select OF_FLATTREE
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FUNCTION_TRACER
@@ -135,6 +134,7 @@ config PPC
         select GENERIC_ATOMIC64 if PPC32
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
+        select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
 
 config EARLY_PRINTK
         bool
@@ -166,10 +166,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config PPC_OF
         def_bool y
 
-config OF
-        def_bool y
-        select OF_FLATTREE
-
 config PPC_UDBG_16550
         bool
         default n
@@ -192,10 +188,6 @@ config SYS_SUPPORTS_APM_EMULATION
         default y if PMAC_APM_EMU
         bool
 
-config DTC
-       bool
-       default y
-
 config DEFAULT_UIMAGE
         bool
         help
@@ -212,7 +204,7 @@ config ARCH_HIBERNATION_POSSIBLE
 config ARCH_SUSPEND_POSSIBLE
         def_bool y
         depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
-                   PPC_85xx || PPC_86xx
+                   PPC_85xx || PPC_86xx || PPC_PSERIES
 
 config PPC_DCR_NATIVE
         bool
@@ -345,7 +337,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
 
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
-        depends on (PPC_BOOK3S || (FSL_BOOKE && !SMP)) && EXPERIMENTAL
+        depends on (PPC_BOOK3S || FSL_BOOKE) && EXPERIMENTAL
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -362,8 +354,8 @@ config KEXEC
 
 config CRASH_DUMP
         bool "Build a kdump crash kernel"
-        depends on PPC64 || 6xx
-        select RELOCATABLE if PPC64
+        depends on PPC64 || 6xx || FSL_BOOKE
+        select RELOCATABLE if PPC64 || FSL_BOOKE
         help
           Build a kernel suitable for use as a kdump capture kernel.
           The same kernel binary can be used as production kernel and dump
@@ -572,14 +564,6 @@ config SCHED_SMT
           when dealing with POWER5 cpus at a cost of slightly increased
           overhead in some places. If unsure say N here.
 
-config PROC_DEVICETREE
-        bool "Support for device tree in /proc"
-        depends on PROC_FS
-        help
-          This option adds a device-tree directory under /proc which contains
-          an image of the device tree that the kernel copies from Open
-          Firmware or other boot firmware. If unsure, say Y here.
-
 config CMDLINE_BOOL
         bool "Default bootloader kernel arguments"
 
@@ -662,7 +646,7 @@ config NEED_SG_DMA_LENGTH
 
 config GENERIC_ISA_DMA
         bool
-        depends on PPC64 || POWER4 || 6xx && !CPM2
+        depends on ISA_DMA_API
         default y
 
 config PPC_INDIRECT_PCI
@@ -891,7 +875,7 @@ config KERNEL_START_BOOL
 config KERNEL_START
         hex "Virtual address of kernel base" if KERNEL_START_BOOL
         default PAGE_OFFSET if PAGE_OFFSET_BOOL
-        default "0xc2000000" if CRASH_DUMP
+        default "0xc2000000" if CRASH_DUMP && !RELOCATABLE
         default "0xc0000000"
 
 config PHYSICAL_START_BOOL
@@ -904,7 +888,7 @@ config PHYSICAL_START_BOOL
 
 config PHYSICAL_START
         hex "Physical address where the kernel is loaded" if PHYSICAL_START_BOOL
-        default "0x02000000" if PPC_STD_MMU && CRASH_DUMP
+        default "0x02000000" if PPC_STD_MMU && CRASH_DUMP && !RELOCATABLE
         default "0x00000000"
 
 config PHYSICAL_ALIGN