summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2005-07-27 11:44:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:25:55 -0700
commit7b625c001a897394b969becac3358d733728d02b (patch)
tree87f0b923686122c91a82f7d8a6821f62bdec8973 /arch
parent12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a (diff)
downloadop-kernel-dev-7b625c001a897394b969becac3358d733728d02b.zip
op-kernel-dev-7b625c001a897394b969becac3358d733728d02b.tar.gz
[PATCH] ppc/ppc64: use Kconfig.hz
use new Kconfig.hz on ppc/ppc64, use also Kconfig.preempt for ppc Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/Kconfig12
-rw-r--r--arch/ppc64/Kconfig1
2 files changed, 3 insertions, 10 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index b833cbc..be4e629 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -935,19 +935,11 @@ config NR_CPUS
depends on SMP
default "4"
-config PREEMPT
- bool "Preemptible Kernel"
- help
- This option reduces the latency of the kernel when reacting to
- real-time or interactive events by allowing a low priority process to
- be preempted even if it is in kernel mode executing a system call.
-
- Say Y here if you are building a kernel for a desktop, embedded
- or real-time system. Say N if you are unsure.
-
config HIGHMEM
bool "High memory support"
+source kernel/Kconfig.hz
+source kernel/Kconfig.preempt
source "mm/Kconfig"
source "fs/Kconfig.binfmt"
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index fdd8afb..2ce8783 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -288,6 +288,7 @@ config SCHED_SMT
overhead in some places. If unsure say N here.
source "kernel/Kconfig.preempt"
+source kernel/Kconfig.hz
config EEH
bool "PCI Extended Error Handling (EEH)" if EMBEDDED
OpenPOWER on IntegriCloud