linux/arch/x86/kernel/apic
Linus Torvalds 3044100e58 Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
  x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S
  xen: Cope with unmapped pages when initializing kernel pagetable
  memblock, bootmem: Round pfn properly for memory and reserved regions
  memblock: Annotate memblock functions with __init_memblock
  memblock: Allow memblock_init to be called early
  memblock/arm: Fix memblock_region_is_memory() typo
  x86, memblock: Remove __memblock_x86_find_in_range_size()
  memblock: Fix wraparound in find_region()
  x86-32, memblock: Make add_highpages honor early reserved ranges
  x86, memblock: Fix crashkernel allocation
  arm, memblock: Fix the sparsemem build
  memblock: Fix section mismatch warnings
  powerpc, memblock: Fix memblock API change fallout
  memblock, microblaze: Fix memblock API change fallout
  x86: Remove old bootmem code
  x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
  x86: Remove not used early_res code
  x86, memblock: Replace e820_/_early string with memblock_
  x86: Use memblock to replace early_res
  x86, memblock: Use memblock_debug to control debug message print out
  ...

Fix up trivial conflicts in arch/x86/kernel/setup.c and kernel/Makefile
2010-10-21 18:52:11 -07:00
..
apic_flat_64.c arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code 2010-02-04 11:55:47 +01:00
apic_noop.c x86: Fix bogus warning in apic_noop.apic_write() 2009-12-07 13:16:37 +01:00
apic.c apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets 2010-10-20 04:42:13 +02:00
bigsmp_32.c x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system 2009-12-17 22:03:06 -08:00
es7000_32.c x86/apic/es7000_32: Remove unused variable 2010-07-08 09:14:37 +02:00
hw_nmi.c x86, watchdog: Fix build error in hw_nmi.c 2010-05-13 09:12:39 +02:00
io_apic.c x86: ioapic: Call free_irte only if interrupt remapping enabled 2010-10-19 09:25:33 +02:00
ipi.c Merge commit 'v2.6.31-rc7' into x86/cleanups 2009-08-24 12:25:54 +02:00
Makefile lockup_detector: Cross arch compile fixes 2010-05-16 04:25:14 +02:00
nmi.c x86: i8259: Convert to new irq_chip functions 2010-10-12 16:53:36 +02:00
numaq_32.c x86, memblock: Replace e820_/_early string with memblock_ 2010-08-27 11:13:47 -07:00
probe_32.c x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs 2010-02-09 20:51:11 -08:00
probe_64.c x86, x2apic: Simplify apic init in SMP and UP builds 2010-09-15 17:37:10 -07:00
summit_32.c x86: apic: Do not use stacked physid_mask_t 2009-11-10 05:52:07 +01:00
x2apic_cluster.c x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system 2009-12-17 22:03:06 -08:00
x2apic_phys.c x86, irq: Allow 0xff for /proc/irq/[n]/smp_affinity on an 8-cpu system 2009-12-17 22:03:06 -08:00
x2apic_uv_x.c x86, UV: Fix initialization of max_pnode 2010-09-10 17:15:49 +02:00