aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 00:34:19 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 00:34:19 -0500
commit66a173b926891023e34e78cb32f4681d19777e01 (patch)
treee6018f50fbceea7c07e6e27368ee817f9adb34f2 /arch/powerpc/Kconfig
parent11db81a59d0b2e563e30512cd76f23d0db384780 (diff)
parent0c4888ef1d8a8b82c29075ce7e257ff795af15c7 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt: "The bulk of this is LE updates. One should now be able to build an LE kernel and even run some things in it. I'm still sitting on a handful of patches to enable the new ABI that I *might* still send this merge window around, but due to the incertainty (they are pretty fresh) I want to keep them separate. Other notable changes are some infrastructure bits to better handle PCI pass-through under KVM, some bits and pieces added to the new PowerNV platform support such as access to the CPU SCOM bus via sysfs, and support for EEH error handling on PHB3 (Power8 PCIe). We also grew arch_get_random_long() for both pseries and powernv when running on P7+ and P8, exploiting the HW rng. And finally various embedded updates from freescale" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (154 commits) powerpc: Fix fatal SLB miss when restoring PPR powerpc/powernv: Reserve the correct PE number powerpc/powernv: Add PE to its own PELTV powerpc/powernv: Add support for indirect XSCOM via debugfs powerpc/scom: Improve debugfs interface powerpc/scom: Enable 64-bit addresses powerpc/boot: Properly handle the base "of" boot wrapper powerpc/bpf: Support MOD operation powerpc/bpf: Fix DIVWU instruction opcode of: Move definition of of_find_next_cache_node into common code. powerpc: Remove big endianness assumption in of_find_next_cache_node powerpc/tm: Remove interrupt disable in __switch_to() powerpc: word-at-a-time optimization for 64-bit Little Endian powerpc/bpf: BPF JIT compiler for 64-bit Little Endian powerpc: Only save/restore SDR1 if in hypervisor mode powerpc/pmu: Fix ADB_PMU_LED_IDE dependencies powerpc/nvram: Fix endian issue when using the partition length powerpc/nvram: Fix endian issue when reading the NVRAM size powerpc/nvram: Scan partitions only once powerpc/mpc512x: remove unnecessary #if ...
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b365d5cbb722..2f898d63eb96 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -97,7 +97,7 @@ config PPC
97 select VIRT_TO_BUS if !PPC64 97 select VIRT_TO_BUS if !PPC64
98 select HAVE_IDE 98 select HAVE_IDE
99 select HAVE_IOREMAP_PROT 99 select HAVE_IOREMAP_PROT
100 select HAVE_EFFICIENT_UNALIGNED_ACCESS 100 select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_LITTLE_ENDIAN
101 select HAVE_KPROBES 101 select HAVE_KPROBES
102 select HAVE_ARCH_KGDB 102 select HAVE_ARCH_KGDB
103 select HAVE_KRETPROBES 103 select HAVE_KRETPROBES
@@ -140,6 +140,9 @@ config PPC
140 select HAVE_DEBUG_STACKOVERFLOW 140 select HAVE_DEBUG_STACKOVERFLOW
141 select HAVE_IRQ_EXIT_ON_IRQ_STACK 141 select HAVE_IRQ_EXIT_ON_IRQ_STACK
142 142
143config GENERIC_CSUM
144 def_bool CPU_LITTLE_ENDIAN
145
143config EARLY_PRINTK 146config EARLY_PRINTK
144 bool 147 bool
145 default y 148 default y
@@ -405,7 +408,7 @@ config CRASH_DUMP
405 408
406config FA_DUMP 409config FA_DUMP
407 bool "Firmware-assisted dump" 410 bool "Firmware-assisted dump"
408 depends on PPC64 && PPC_RTAS && CRASH_DUMP 411 depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC
409 help 412 help
410 A robust mechanism to get reliable kernel crash dump with 413 A robust mechanism to get reliable kernel crash dump with
411 assistance from firmware. This approach does not use kexec, 414 assistance from firmware. This approach does not use kexec,
@@ -418,7 +421,7 @@ config FA_DUMP
418 421
419config IRQ_ALL_CPUS 422config IRQ_ALL_CPUS
420 bool "Distribute interrupts on all CPUs by default" 423 bool "Distribute interrupts on all CPUs by default"
421 depends on SMP && !MV64360 424 depends on SMP
422 help 425 help
423 This option gives the kernel permission to distribute IRQs across 426 This option gives the kernel permission to distribute IRQs across
424 multiple CPUs. Saying N here will route all IRQs to the first 427 multiple CPUs. Saying N here will route all IRQs to the first
@@ -1010,6 +1013,9 @@ config PHYSICAL_START
1010 default "0x00000000" 1013 default "0x00000000"
1011endif 1014endif
1012 1015
1016config ARCH_RANDOM
1017 def_bool n
1018
1013source "net/Kconfig" 1019source "net/Kconfig"
1014 1020
1015source "drivers/Kconfig" 1021source "drivers/Kconfig"