From 757e48c29397abaf4cac5f9f3c47c2f26cbff911 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 27 Jul 2005 11:44:03 -0700 Subject: [PATCH] --- yaml --- r: 5134 b: refs/heads/master c: 7b625c001a897394b969becac3358d733728d02b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ppc/Kconfig | 12 ++---------- trunk/arch/ppc64/Kconfig | 1 + 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7ca1c8ef64f7..1588380902ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a +refs/heads/master: 7b625c001a897394b969becac3358d733728d02b diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig index b833cbcd77f0..be4e629e69d0 100644 --- a/trunk/arch/ppc/Kconfig +++ b/trunk/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/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig index fdd8afba7152..2ce87836c671 100644 --- a/trunk/arch/ppc64/Kconfig +++ b/trunk/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