--- arch/x86/Kconfig

+++ arch/x86/Kconfig

@@ -227,11 +227,6 @@ config X86_32_LAZY_GS

config KTIME_SCALAR

def_bool X86_32

-

-config ARCH_CPU_PROBE_RELEASE

- def_bool y

- depends on HOTPLUG_CPU

-

source "init/Kconfig"

source "kernel/Kconfig.freezer"

@@ -753,17 +748,6 @@ config SCHED_MC

making when dealing with multi-core CPU chips at a cost of slightly

increased overhead in some places. If unsure say N here.

-config IRQ_TIME_ACCOUNTING

- bool "Fine granularity task level IRQ time accounting"

- default n

- ---help---

- Select this option to enable fine granularity task irq time

- accounting. This is done by reading a timestamp on each

- transitions between softirq and hardirq state, so there can be a

- small performance impact.

-

- If in doubt, say N here.

-

source "kernel/Kconfig.preempt"

config X86_UP_APIC

@@ -1062,7 +1046,7 @@ endchoice

choice

depends on EXPERIMENTAL

- prompt "Memory split"

+ prompt "Memory split" if EMBEDDED

default VMSPLIT_3G

depends on X86_32

---help---

@@ -1082,17 +1066,17 @@ choice

option alone!

config VMSPLIT_3G

- bool "Default 896MB lowmem (3G/1G user/kernel split)"

+ bool "3G/1G user/kernel split"

config VMSPLIT_3G_OPT

depends on !X86_PAE

- bool "1GB lowmem (3G/1G user/kernel split)"

+ bool "3G/1G user/kernel split (for full 1G low memory)"

config VMSPLIT_2G

- bool "2GB lowmem (2G/2G user/kernel split)"

+ bool "2G/2G user/kernel split"

config VMSPLIT_2G_OPT

depends on !X86_PAE

- bool "2GB lowmem (2G/2G user/kernel split)"

+ bool "2G/2G user/kernel split (for full 2G low memory)"

config VMSPLIT_1G

- bool "3GB lowmem (1G/3G user/kernel split)"

+ bool "1G/3G user/kernel split"

endchoice

config PAGE_OFFSET