aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 11:40:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 11:40:21 -0400
commitb7723f9d21d8d6043e63f5e3e412f321f5f1900c (patch)
tree984098e5c060600e90e62f1b101593805f7cb2e9
parent93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65 (diff)
parent6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b (diff)
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Clean up arch/x86/Kconfig* x86-64: Don't export init_level4_pgt
-rw-r--r--arch/x86/Kconfig49
-rw-r--r--arch/x86/Kconfig.debug2
-rw-r--r--arch/x86/include/asm/boot.h2
-rw-r--r--arch/x86/kernel/x8664_ksyms_64.c1
4 files changed, 16 insertions, 38 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 01177dcbe261..7b7838874552 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -201,20 +201,17 @@ config HAVE_INTEL_TXT
201 201
202# Use the generic interrupt handling code in kernel/irq/: 202# Use the generic interrupt handling code in kernel/irq/:
203config GENERIC_HARDIRQS 203config GENERIC_HARDIRQS
204 bool 204 def_bool y
205 default y
206 205
207config GENERIC_HARDIRQS_NO__DO_IRQ 206config GENERIC_HARDIRQS_NO__DO_IRQ
208 def_bool y 207 def_bool y
209 208
210config GENERIC_IRQ_PROBE 209config GENERIC_IRQ_PROBE
211 bool 210 def_bool y
212 default y
213 211
214config GENERIC_PENDING_IRQ 212config GENERIC_PENDING_IRQ
215 bool 213 def_bool y
216 depends on GENERIC_HARDIRQS && SMP 214 depends on GENERIC_HARDIRQS && SMP
217 default y
218 215
219config USE_GENERIC_SMP_HELPERS 216config USE_GENERIC_SMP_HELPERS
220 def_bool y 217 def_bool y
@@ -229,14 +226,12 @@ config X86_64_SMP
229 depends on X86_64 && SMP 226 depends on X86_64 && SMP
230 227
231config X86_HT 228config X86_HT
232 bool 229 def_bool y
233 depends on SMP 230 depends on SMP
234 default y
235 231
236config X86_TRAMPOLINE 232config X86_TRAMPOLINE
237 bool 233 def_bool y
238 depends on SMP || (64BIT && ACPI_SLEEP) 234 depends on SMP || (64BIT && ACPI_SLEEP)
239 default y
240 235
241config X86_32_LAZY_GS 236config X86_32_LAZY_GS
242 def_bool y 237 def_bool y
@@ -451,7 +446,7 @@ config X86_NUMAQ
451 firmware with - send email to <Martin.Bligh@us.ibm.com>. 446 firmware with - send email to <Martin.Bligh@us.ibm.com>.
452 447
453config X86_SUPPORTS_MEMORY_FAILURE 448config X86_SUPPORTS_MEMORY_FAILURE
454 bool 449 def_bool y
455 # MCE code calls memory_failure(): 450 # MCE code calls memory_failure():
456 depends on X86_MCE 451 depends on X86_MCE
457 # On 32-bit this adds too big of NODES_SHIFT and we run out of page flags: 452 # On 32-bit this adds too big of NODES_SHIFT and we run out of page flags:
@@ -459,7 +454,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
459 # On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH: 454 # On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH:
460 depends on X86_64 || !SPARSEMEM 455 depends on X86_64 || !SPARSEMEM
461 select ARCH_SUPPORTS_MEMORY_FAILURE 456 select ARCH_SUPPORTS_MEMORY_FAILURE
462 default y
463 457
464config X86_VISWS 458config X86_VISWS
465 bool "SGI 320/540 (Visual Workstation)" 459 bool "SGI 320/540 (Visual Workstation)"
@@ -574,7 +568,6 @@ config PARAVIRT_SPINLOCKS
574 568
575config PARAVIRT_CLOCK 569config PARAVIRT_CLOCK
576 bool 570 bool
577 default n
578 571
579endif 572endif
580 573
@@ -753,7 +746,6 @@ config MAXSMP
753 bool "Configure Maximum number of SMP Processors and NUMA Nodes" 746 bool "Configure Maximum number of SMP Processors and NUMA Nodes"
754 depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL 747 depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
755 select CPUMASK_OFFSTACK 748 select CPUMASK_OFFSTACK
756 default n
757 ---help--- 749 ---help---
758 Configure maximum number of CPUS and NUMA Nodes for this architecture. 750 Configure maximum number of CPUS and NUMA Nodes for this architecture.
759 If unsure, say N. 751 If unsure, say N.
@@ -833,7 +825,6 @@ config X86_VISWS_APIC
833 825
834config X86_REROUTE_FOR_BROKEN_BOOT_IRQS 826config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
835 bool "Reroute for broken boot IRQs" 827 bool "Reroute for broken boot IRQs"
836 default n
837 depends on X86_IO_APIC 828 depends on X86_IO_APIC
838 ---help--- 829 ---help---
839 This option enables a workaround that fixes a source of 830 This option enables a workaround that fixes a source of
@@ -880,9 +871,8 @@ config X86_MCE_AMD
880 the DRAM Error Threshold. 871 the DRAM Error Threshold.
881 872
882config X86_ANCIENT_MCE 873config X86_ANCIENT_MCE
883 def_bool n 874 bool "Support for old Pentium 5 / WinChip machine checks"
884 depends on X86_32 && X86_MCE 875 depends on X86_32 && X86_MCE
885 prompt "Support for old Pentium 5 / WinChip machine checks"
886 ---help--- 876 ---help---
887 Include support for machine check handling on old Pentium 5 or WinChip 877 Include support for machine check handling on old Pentium 5 or WinChip
888 systems. These typically need to be enabled explicitely on the command 878 systems. These typically need to be enabled explicitely on the command
@@ -890,8 +880,7 @@ config X86_ANCIENT_MCE
890 880
891config X86_MCE_THRESHOLD 881config X86_MCE_THRESHOLD
892 depends on X86_MCE_AMD || X86_MCE_INTEL 882 depends on X86_MCE_AMD || X86_MCE_INTEL
893 bool 883 def_bool y
894 default y
895 884
896config X86_MCE_INJECT 885config X86_MCE_INJECT
897 depends on X86_MCE 886 depends on X86_MCE
@@ -1030,8 +1019,8 @@ config X86_CPUID
1030 1019
1031choice 1020choice
1032 prompt "High Memory Support" 1021 prompt "High Memory Support"
1033 default HIGHMEM4G if !X86_NUMAQ
1034 default HIGHMEM64G if X86_NUMAQ 1022 default HIGHMEM64G if X86_NUMAQ
1023 default HIGHMEM4G
1035 depends on X86_32 1024 depends on X86_32
1036 1025
1037config NOHIGHMEM 1026config NOHIGHMEM
@@ -1289,7 +1278,7 @@ source "mm/Kconfig"
1289 1278
1290config HIGHPTE 1279config HIGHPTE
1291 bool "Allocate 3rd-level pagetables from highmem" 1280 bool "Allocate 3rd-level pagetables from highmem"
1292 depends on X86_32 && (HIGHMEM4G || HIGHMEM64G) 1281 depends on HIGHMEM
1293 ---help--- 1282 ---help---
1294 The VM uses one page table entry for each page of physical memory. 1283 The VM uses one page table entry for each page of physical memory.
1295 For systems with a lot of RAM, this can be wasteful of precious 1284 For systems with a lot of RAM, this can be wasteful of precious
@@ -1373,8 +1362,7 @@ config MATH_EMULATION
1373 kernel, it won't hurt. 1362 kernel, it won't hurt.
1374 1363
1375config MTRR 1364config MTRR
1376 bool 1365 def_bool y
1377 default y
1378 prompt "MTRR (Memory Type Range Register) support" if EMBEDDED 1366 prompt "MTRR (Memory Type Range Register) support" if EMBEDDED
1379 ---help--- 1367 ---help---
1380 On Intel P6 family processors (Pentium Pro, Pentium II and later) 1368 On Intel P6 family processors (Pentium Pro, Pentium II and later)
@@ -1440,8 +1428,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
1440 mtrr_spare_reg_nr=N on the kernel command line. 1428 mtrr_spare_reg_nr=N on the kernel command line.
1441 1429
1442config X86_PAT 1430config X86_PAT
1443 bool 1431 def_bool y
1444 default y
1445 prompt "x86 PAT support" if EMBEDDED 1432 prompt "x86 PAT support" if EMBEDDED
1446 depends on MTRR 1433 depends on MTRR
1447 ---help--- 1434 ---help---
@@ -1609,8 +1596,7 @@ config X86_NEED_RELOCS
1609 depends on X86_32 && RELOCATABLE 1596 depends on X86_32 && RELOCATABLE
1610 1597
1611config PHYSICAL_ALIGN 1598config PHYSICAL_ALIGN
1612 hex 1599 hex "Alignment value to which kernel should be aligned" if X86_32
1613 prompt "Alignment value to which kernel should be aligned" if X86_32
1614 default "0x1000000" 1600 default "0x1000000"
1615 range 0x2000 0x1000000 1601 range 0x2000 0x1000000
1616 ---help--- 1602 ---help---
@@ -1657,7 +1643,6 @@ config COMPAT_VDSO
1657 1643
1658config CMDLINE_BOOL 1644config CMDLINE_BOOL
1659 bool "Built-in kernel command line" 1645 bool "Built-in kernel command line"
1660 default n
1661 ---help--- 1646 ---help---
1662 Allow for specifying boot arguments to the kernel at 1647 Allow for specifying boot arguments to the kernel at
1663 build time. On some systems (e.g. embedded ones), it is 1648 build time. On some systems (e.g. embedded ones), it is
@@ -1691,7 +1676,6 @@ config CMDLINE
1691 1676
1692config CMDLINE_OVERRIDE 1677config CMDLINE_OVERRIDE
1693 bool "Built-in command line overrides boot loader arguments" 1678 bool "Built-in command line overrides boot loader arguments"
1694 default n
1695 depends on CMDLINE_BOOL 1679 depends on CMDLINE_BOOL
1696 ---help--- 1680 ---help---
1697 Set this option to 'Y' to have the kernel ignore the boot loader 1681 Set this option to 'Y' to have the kernel ignore the boot loader
@@ -1727,8 +1711,7 @@ source "drivers/acpi/Kconfig"
1727source "drivers/sfi/Kconfig" 1711source "drivers/sfi/Kconfig"
1728 1712
1729config X86_APM_BOOT 1713config X86_APM_BOOT
1730 bool 1714 def_bool y
1731 default y
1732 depends on APM || APM_MODULE 1715 depends on APM || APM_MODULE
1733 1716
1734menuconfig APM 1717menuconfig APM
@@ -1957,8 +1940,7 @@ config DMAR_DEFAULT_ON
1957 experimental. 1940 experimental.
1958 1941
1959config DMAR_BROKEN_GFX_WA 1942config DMAR_BROKEN_GFX_WA
1960 def_bool n 1943 bool "Workaround broken graphics drivers (going away soon)"
1961 prompt "Workaround broken graphics drivers (going away soon)"
1962 depends on DMAR && BROKEN 1944 depends on DMAR && BROKEN
1963 ---help--- 1945 ---help---
1964 Current Graphics drivers tend to use physical address 1946 Current Graphics drivers tend to use physical address
@@ -2056,7 +2038,6 @@ config SCx200HR_TIMER
2056config OLPC 2038config OLPC
2057 bool "One Laptop Per Child support" 2039 bool "One Laptop Per Child support"
2058 select GPIOLIB 2040 select GPIOLIB
2059 default n
2060 ---help--- 2041 ---help---
2061 Add support for detecting the unique features of the OLPC 2042 Add support for detecting the unique features of the OLPC
2062 XO hardware. 2043 XO hardware.
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index bd58c8abbfbd..75085080b63e 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -45,7 +45,6 @@ config EARLY_PRINTK
45 45
46config EARLY_PRINTK_DBGP 46config EARLY_PRINTK_DBGP
47 bool "Early printk via EHCI debug port" 47 bool "Early printk via EHCI debug port"
48 default n
49 depends on EARLY_PRINTK && PCI 48 depends on EARLY_PRINTK && PCI
50 ---help--- 49 ---help---
51 Write kernel log output directly into the EHCI debug port. 50 Write kernel log output directly into the EHCI debug port.
@@ -76,7 +75,6 @@ config DEBUG_PER_CPU_MAPS
76 bool "Debug access to per_cpu maps" 75 bool "Debug access to per_cpu maps"
77 depends on DEBUG_KERNEL 76 depends on DEBUG_KERNEL
78 depends on SMP 77 depends on SMP
79 default n
80 ---help--- 78 ---help---
81 Say Y to verify that the per_cpu map being accessed has 79 Say Y to verify that the per_cpu map being accessed has
82 been setup. Adds a fair amount of code to kernel memory 80 been setup. Adds a fair amount of code to kernel memory
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 7a1065958ba9..3b62ab56c7a0 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -24,7 +24,7 @@
24#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2) 24#define MIN_KERNEL_ALIGN (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)
25 25
26#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \ 26#if (CONFIG_PHYSICAL_ALIGN & (CONFIG_PHYSICAL_ALIGN-1)) || \
27 (CONFIG_PHYSICAL_ALIGN < (_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)) 27 (CONFIG_PHYSICAL_ALIGN < MIN_KERNEL_ALIGN)
28#error "Invalid value for CONFIG_PHYSICAL_ALIGN" 28#error "Invalid value for CONFIG_PHYSICAL_ALIGN"
29#endif 29#endif
30 30
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index 693920b22496..1b950d151e58 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -54,7 +54,6 @@ EXPORT_SYMBOL(memcpy);
54EXPORT_SYMBOL(__memcpy); 54EXPORT_SYMBOL(__memcpy);
55 55
56EXPORT_SYMBOL(empty_zero_page); 56EXPORT_SYMBOL(empty_zero_page);
57EXPORT_SYMBOL(init_level4_pgt);
58#ifndef CONFIG_PARAVIRT 57#ifndef CONFIG_PARAVIRT
59EXPORT_SYMBOL(native_load_gs_index); 58EXPORT_SYMBOL(native_load_gs_index);
60#endif 59#endif