aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-11 11:55:42 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-11 11:55:42 -0400
commit940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch)
treed141e08ced08c40c6a8e3ab2cdecde5ff14e560f /arch/x86/Kconfig
parent8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff)
parent991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff)
Merge branch 'linus' into perfcounters/core
Conflicts: arch/x86/kernel/irqinit.c arch/x86/kernel/irqinit_64.c arch/x86/kernel/traps.c arch/x86/mm/fault.c include/linux/sched.h kernel/exit.c
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig53
1 files changed, 27 insertions, 26 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cfd78c87a573..68f5578fe38e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -47,6 +47,11 @@ config X86
47 select HAVE_KERNEL_BZIP2 47 select HAVE_KERNEL_BZIP2
48 select HAVE_KERNEL_LZMA 48 select HAVE_KERNEL_LZMA
49 49
50config OUTPUT_FORMAT
51 string
52 default "elf32-i386" if X86_32
53 default "elf64-x86-64" if X86_64
54
50config ARCH_DEFCONFIG 55config ARCH_DEFCONFIG
51 string 56 string
52 default "arch/x86/configs/i386_defconfig" if X86_32 57 default "arch/x86/configs/i386_defconfig" if X86_32
@@ -274,15 +279,9 @@ config SPARSE_IRQ
274 279
275 If you don't know what to do here, say N. 280 If you don't know what to do here, say N.
276 281
277config NUMA_MIGRATE_IRQ_DESC 282config NUMA_IRQ_DESC
278 bool "Move irq desc when changing irq smp_affinity" 283 def_bool y
279 depends on SPARSE_IRQ && NUMA 284 depends on SPARSE_IRQ && NUMA
280 depends on BROKEN
281 default n
282 ---help---
283 This enables moving irq_desc to cpu/node that irq will use handled.
284
285 If you don't know what to do here, say N.
286 285
287config X86_MPPARSE 286config X86_MPPARSE
288 bool "Enable MPS table" if ACPI 287 bool "Enable MPS table" if ACPI
@@ -355,7 +354,7 @@ config X86_UV
355 depends on X86_64 354 depends on X86_64
356 depends on X86_EXTENDED_PLATFORM 355 depends on X86_EXTENDED_PLATFORM
357 depends on NUMA 356 depends on NUMA
358 select X86_X2APIC 357 depends on X86_X2APIC
359 ---help--- 358 ---help---
360 This option is needed in order to support SGI Ultraviolet systems. 359 This option is needed in order to support SGI Ultraviolet systems.
361 If you don't have one of these, you should say N here. 360 If you don't have one of these, you should say N here.
@@ -1467,9 +1466,7 @@ config KEXEC_JUMP
1467 1466
1468config PHYSICAL_START 1467config PHYSICAL_START
1469 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) 1468 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
1470 default "0x1000000" if X86_NUMAQ 1469 default "0x1000000"
1471 default "0x200000" if X86_64
1472 default "0x100000"
1473 ---help--- 1470 ---help---
1474 This gives the physical address where the kernel is loaded. 1471 This gives the physical address where the kernel is loaded.
1475 1472
@@ -1488,15 +1485,15 @@ config PHYSICAL_START
1488 to be specifically compiled to run from a specific memory area 1485 to be specifically compiled to run from a specific memory area
1489 (normally a reserved region) and this option comes handy. 1486 (normally a reserved region) and this option comes handy.
1490 1487
1491 So if you are using bzImage for capturing the crash dump, leave 1488 So if you are using bzImage for capturing the crash dump,
1492 the value here unchanged to 0x100000 and set CONFIG_RELOCATABLE=y. 1489 leave the value here unchanged to 0x1000000 and set
1493 Otherwise if you plan to use vmlinux for capturing the crash dump 1490 CONFIG_RELOCATABLE=y. Otherwise if you plan to use vmlinux
1494 change this value to start of the reserved region (Typically 16MB 1491 for capturing the crash dump change this value to start of
1495 0x1000000). In other words, it can be set based on the "X" value as 1492 the reserved region. In other words, it can be set based on
1496 specified in the "crashkernel=YM@XM" command line boot parameter 1493 the "X" value as specified in the "crashkernel=YM@XM"
1497 passed to the panic-ed kernel. Typically this parameter is set as 1494 command line boot parameter passed to the panic-ed
1498 crashkernel=64M@16M. Please take a look at 1495 kernel. Please take a look at Documentation/kdump/kdump.txt
1499 Documentation/kdump/kdump.txt for more details about crash dumps. 1496 for more details about crash dumps.
1500 1497
1501 Usage of bzImage for capturing the crash dump is recommended as 1498 Usage of bzImage for capturing the crash dump is recommended as
1502 one does not have to build two kernels. Same kernel can be used 1499 one does not have to build two kernels. Same kernel can be used
@@ -1509,8 +1506,8 @@ config PHYSICAL_START
1509 Don't change this unless you know what you are doing. 1506 Don't change this unless you know what you are doing.
1510 1507
1511config RELOCATABLE 1508config RELOCATABLE
1512 bool "Build a relocatable kernel (EXPERIMENTAL)" 1509 bool "Build a relocatable kernel"
1513 depends on EXPERIMENTAL 1510 default y
1514 ---help--- 1511 ---help---
1515 This builds a kernel image that retains relocation information 1512 This builds a kernel image that retains relocation information
1516 so it can be loaded someplace besides the default 1MB. 1513 so it can be loaded someplace besides the default 1MB.
@@ -1525,12 +1522,16 @@ config RELOCATABLE
1525 it has been loaded at and the compile time physical address 1522 it has been loaded at and the compile time physical address
1526 (CONFIG_PHYSICAL_START) is ignored. 1523 (CONFIG_PHYSICAL_START) is ignored.
1527 1524
1525# Relocation on x86-32 needs some additional build support
1526config X86_NEED_RELOCS
1527 def_bool y
1528 depends on X86_32 && RELOCATABLE
1529
1528config PHYSICAL_ALIGN 1530config PHYSICAL_ALIGN
1529 hex 1531 hex
1530 prompt "Alignment value to which kernel should be aligned" if X86_32 1532 prompt "Alignment value to which kernel should be aligned" if X86_32
1531 default "0x100000" if X86_32 1533 default "0x1000000"
1532 default "0x200000" if X86_64 1534 range 0x2000 0x1000000
1533 range 0x2000 0x400000
1534 ---help--- 1535 ---help---
1535 This value puts the alignment restrictions on physical address 1536 This value puts the alignment restrictions on physical address
1536 where kernel is loaded and run from. Kernel is compiled for an 1537 where kernel is loaded and run from. Kernel is compiled for an