Patches contributed by Eötvös Lorand University
commit a1be621dfacbef0fd374d8acd553d71e07bf29ac
Merge: 3612fdf780e2 fec6c6fec3e2
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 4 11:14:47 2009 +0100
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
commit 91d75e209bd59695f0708d66964d928d45b3b2f3
Merge: 9976b39b5031 8b0e5860cb09
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 4 02:29:19 2009 +0100
Merge branch 'x86/core' into core/percpu
commit 8b0e5860cb099d7958d13b00ffbc35ad02735700
Merge: b6122b384321 327f4387e39c c577b098f9bf 03787ceed8f7 2fb6b2a048ed ab76f3d77159 2505170211f7 780eef9492b1
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 4 02:22:31 2009 +0100
Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core
diff --cc arch/x86/Kconfig
index 5e2919c0ff92,1042d69b267d,5e2919c0ff92,8955262caa34,d9084320279e,7b66c34d0aae,5e2919c0ff92,bc2fbadff9f9..469f3450bf81
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@@@@ -235,20 -235,6 -235,20 -235,20 -235,20 -246,10 -235,20 -244,10 +238,20 @@@@@@@@@ config SM
If you don't know what to do here, say N.
- -config X86_HAS_BOOT_CPU_ID
- - def_bool y
- - depends on X86_VOYAGER
+ + +config X86_X2APIC
+ + + bool "Support x2apic"
+ + + depends on X86_LOCAL_APIC && X86_64
+ + + ---help---
+ + + This enables x2apic support on CPUs that have this feature.
+ + +
+ + + This allows 32-bit apic IDs (so it can support very large systems),
+ + + and accesses the local apic via MSRs not via mmio.
+ + +
+ + + ( On certain CPU models you may need to enable INTR_REMAP too,
+ + + to get functional x2apic mode. )
+ + +
+ + + If you don't know what to do here, say N.
+
config SPARSE_IRQ
bool "Support sparse irq numbering"
depends on PCI_MSI || HT_IRQ
@@@@@@@@@ -279,75 -265,49 -279,75 -279,50 -279,75 -284,14 -279,75 -282,14 +282,75 @@@@@@@@@ config X86_MPPARS
For old smp systems that do not have proper acpi support. Newer systems
(esp with 64bit cpus) with acpi support, MADT and DSDT will override it
- -choice
- - prompt "Subarchitecture Type"
- - default X86_PC
+ +config X86_BIGSMP
+ + bool "Support for big SMP systems with more than 8 CPUs"
+ + depends on X86_32 && SMP
+ + ---help---
+ + This option is needed for the systems that have more than 8 CPUs
- -config X86_PC
- - bool "PC-compatible"
- - help
- - Choose this option if your computer is a standard PC or compatible.
+ + + +if X86_32
+ +config X86_EXTENDED_PLATFORM
+ + bool "Support for extended (non-PC) x86 platforms"
+ + default y
+ + ---help---
+ + If you disable this option then the kernel will only support
+ + standard PC platforms. (which covers the vast majority of
+ + systems out there.)
+ +
- - If you enable this option then you'll be able to select a number
- - of non-PC x86 platforms.
+ + + + If you enable this option then you'll be able to select support
+ + + + for the following (non-PC) 32 bit x86 platforms:
+ + + + AMD Elan
+ + + + NUMAQ (IBM/Sequent)
+ + + + RDC R-321x SoC
+ + + + SGI 320/540 (Visual Workstation)
+ + + + Summit/EXA (IBM x440)
+ + + + Unisys ES7000 IA32 series
+ +
+ + If you have one of these systems, or if you want to build a
+ + generic distribution kernel, say Y here - otherwise say N.
+ + + +endif
+ + +
+ + + +if X86_64
+ + + +config X86_EXTENDED_PLATFORM
+ + + + bool "Support for extended (non-PC) x86 platforms"
+ + + + default y
+ + + + ---help---
+ + + + If you disable this option then the kernel will only support
+ + + + standard PC platforms. (which covers the vast majority of
+ + + + systems out there.)
+ + + +
+ + + + If you enable this option then you'll be able to select support
+ + + + for the following (non-PC) 64 bit x86 platforms:
+ + + + ScaleMP vSMP
+ + + + SGI Ultraviolet
+ + +
+ + + + If you have one of these systems, or if you want to build a
+ + + + generic distribution kernel, say Y here - otherwise say N.
+ + + +endif
+ +# This is an alphabetically sorted list of 64 bit extended platforms
+ +# Please maintain the alphabetic order if and when there are additions
+ +
+ +config X86_VSMP
+ + bool "ScaleMP vSMP"
+ + select PARAVIRT
+ + depends on X86_64 && PCI
+ + depends on X86_EXTENDED_PLATFORM
+ + ---help---
+ + Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
+ + supposed to run on these EM64T-based machines. Only choose this option
+ + if you have one of these machines.
+ +
+ +config X86_UV
+ + bool "SGI Ultraviolet"
+ + depends on X86_64
+ + depends on X86_EXTENDED_PLATFORM
+ + + select X86_X2APIC
+ + ---help---
+ + This option is needed in order to support SGI Ultraviolet systems.
+ + If you don't have one of these, you should say N here.
+ +
+ +# Following is an alphabetically sorted list of 32 bit extended platforms
+ +# Please maintain the alphabetic order if and when there are additions
config X86_ELAN
bool "AMD Elan"
@@@@@@@@@ -408,20 -368,33 -408,20 -383,33 -408,20 -383,16 -408,20 -381,16 +411,20 @@@@@@@@@ config X86_VISW
A kernel compiled for the Visual Workstation will run on general
PCs as well. See <file:Documentation/sgi-visws.txt> for details.
- -config X86_RDC321X
- - bool "RDC R-321x SoC"
- - depends on X86_32
- - select M486
- - select X86_REBOOTFIXUPS
- - help
- - This option is needed for RDC R-321x system-on-chip, also known
- - as R-8610-(G).
- - If you don't have one of these chips, you should say N here.
+ +config X86_SUMMIT
+ + bool "Summit/EXA (IBM x440)"
+ + depends on X86_32_NON_STANDARD
+ + ---help---
+ + This option is needed for IBM systems that use the Summit/EXA chipset.
+ + In particular, it is needed for the x440.
+ +
+ +config X86_ES7000
+ + bool "Unisys ES7000 IA32 series"
+ + depends on X86_32_NON_STANDARD && X86_BIGSMP
+ + ---help---
+ + Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
+ + supposed to run on an IA32-based Unisys ES7000 system.
- - config X86_VOYAGER
- - bool "Voyager (NCR)"
- - depends on SMP && !PCI && BROKEN
- - depends on X86_32_NON_STANDARD
- - ---help---
- - Voyager is an MCA-based 32-way capable SMP architecture proprietary
- - to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
- -
- - *** WARNING ***
- -
- - If you do not specifically know you have a Voyager based machine,
- - say N here, otherwise the kernel you build will not be bootable.
- -
config SCHED_OMIT_FRAME_POINTER
def_bool y
prompt "Single-depth WCHAN output"
@@@@@@@@@ -1821,17 -1794,17 -1821,17 -1809,17 -1821,17 -1804,6 -1821,17 -1802,17 +1824,17 @@@@@@@@@ config DMA
and include PCI device scope covered by these DMA
remapping devices.
+ config DMAR_DEFAULT_ON
---- - def_bool n
++++ ++ def_bool y
+ prompt "Enable DMA Remapping Devices by default"
+ depends on DMAR
+ help
+ Selecting this option will enable a DMAR device at boot time if
+ one is found. If this option is not selected, DMAR support can
+ be enabled by passing intel_iommu=on to the kernel. It is
+ recommended you say N here while the DMAR code remains
+ experimental.
+
config DMAR_GFX_WA
def_bool y
prompt "Support for Graphics workaround"
@@@@@@@@@ -1855,11 -1828,10 -1855,11 -1843,11 -1855,11 -1827,10 -1855,11 -1836,10 +1858,11 @@@@@@@@@ config DMAR_FLOPPY_W
config INTR_REMAP
bool "Support for Interrupt Remapping (EXPERIMENTAL)"
depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
- - help
- - Supports Interrupt remapping for IO-APIC and MSI devices.
- - To use x2apic mode in the CPU's which support x2APIC enhancements or
- - to support platforms with CPU's having > 8 bit APIC ID, say Y.
+ + + select X86_X2APIC
+ + ---help---
+ + Supports Interrupt remapping for IO-APIC and MSI devices.
+ + To use x2apic mode in the CPU's which support x2APIC enhancements or
+ + to support platforms with CPU's having > 8 bit APIC ID, say Y.
source "drivers/pci/pcie/Kconfig"
commit 3612fdf780e28b10323dd12d2b0f306c7ada4d4c
Merge: 654952bcb999 633ddaa7f471
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 3 16:02:16 2009 +0100
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
commit 03787ceed8f7bf06af29f3b213017d89f8e9423d
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 3 15:32:24 2009 +0100
x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y
Impact: build fix
arch/x86/mm/highmem_32.c:187: error: static declaration of 'set_highmem_pages_init' follows non-static declaration
arch/x86/include/asm/numa_32.h:8: error: previous declaration of 'set_highmem_pages_init' was here
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236082212.2675.24.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 13a823cf564c..00f127c80b0e 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -183,7 +183,7 @@ void __init set_highmem_pages_init(void)
totalram_pages += totalhigh_pages;
}
#else
-static void __init set_highmem_pages_init(void)
+void __init set_highmem_pages_init(void)
{
add_highpages_with_active_regions(0, highstart_pfn, highend_pfn);
commit 654952bcb999ad96e1d9ae9145fe5c0522ec297a
Merge: ed662d9b2a6c c79a61f55773
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 2 23:14:02 2009 +0100
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
commit ed662d9b2a6cb26e1399f57b88b565c0a68c60d4
Merge: fdfa66ab455c 96ccd21cd131
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 2 22:38:31 2009 +0100
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
commit fdfa66ab455c79d699833c43ac0e09900133fd7c
Merge: 4387d6d6b8a7 acdb2c287916 340430c572f7
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 2 22:37:35 2009 +0100
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core
commit c02368a9d059322f913a58111eade87a656fefd5
Merge: f17c75453b2d 778ef1e6cbb0
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 2 22:08:56 2009 +0100
Merge branch 'linus' into irq/genirq
commit 5512b3ece0cbb5024b83099963222700aa45f59e
Merge: c40c6f85a759 8325d9c09ded 54e991242850 778ef1e6cbb0
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 2 12:02:36 2009 +0100
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core