Tejun Heo
ba67cf5cf2
Merge branch 'x86/urgent' into x86-mm
...
Merge reason: Pick up the following two fix commits.
2be19102b7 : x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8 : x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
2011-05-02 14:16:47 +02:00
..
apic.c
x86: A fast way to check capabilities of the current cpu
2011-03-29 10:18:30 +02:00
apic_flat_64.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
apic_noop.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
bigsmp_32.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
es7000_32.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
hw_nmi.c
x86: Stop including <linux/delay.h> in two asm header files
2011-03-29 09:37:42 +02:00
io_apic.c
x86: devicetree: Configure IOAPIC pin only once
2011-04-28 11:38:30 +02:00
ipi.c
x86: Always use x86_cpu_to_logical_apicid for cpu -> logical apic id
2011-01-28 14:54:05 +01:00
Makefile
x86, nmi_watchdog: Remove the old nmi_watchdog
2010-11-18 09:08:23 +01:00
numaq_32.c
x86-32, numa: Calculate remap size in common code
2011-04-06 17:57:16 -07:00
probe_32.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
probe_64.c
x86: Enable the intr-remap fault handling after local APIC setup
2010-12-13 16:53:32 -08:00
summit_32.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
x2apic_cluster.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
x2apic_phys.c
x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node()
2011-01-28 14:54:08 +01:00
x2apic_uv_x.c
x86, UV: Fix kdump reboot
2011-03-31 18:44:03 +02:00