Merge x86-64 update from Andi

diff --cc arch/i386/kernel/cpu/common.c
Simple merge

diff --cc arch/i386/kernel/cpu/intel.c
Simple merge

diff --cc arch/i386/kernel/smpboot.c
index bc5a9d97466b572cf5e6755fc5e5de0eb828b11f,0a9c6465523694bab79436088ae0d21ba4ed0489..d16520da4550e6d1b5d318a56a2f1ba1b852728c
--- 1/arch/i386/kernel/smpboot.c
--- 2/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@@ -71,7 -71,10 +71,8 @@@ int phys_proc_id[NR_CPUS] __read_mostl
  
  /* Core ID of each logical CPU */
  int cpu_core_id[NR_CPUS] __read_mostly = {[0 ... NR_CPUS-1] = BAD_APICID};
 -EXPORT_SYMBOL(cpu_core_id);
  
+ /* representing HT siblings of each logical CPU */
  cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly;
  EXPORT_SYMBOL(cpu_sibling_map);
  

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/x86_64/Kconfig
Simple merge

diff --cc arch/x86_64/Kconfig.debug
Simple merge

diff --cc arch/x86_64/kernel/i8259.c
Simple merge

diff --cc arch/x86_64/kernel/process.c
Simple merge

diff --cc arch/x86_64/kernel/smpboot.c
index c4e59bbdc1872b4ce599f452b125183603cf8f8e,2b9ddba61b37a9e675e830b2172854ea565303b3..683c33f7b96753219a2c1043246dcdfac12b999e
--- 1/arch/x86_64/kernel/smpboot.c
--- 2/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@@ -64,7 -64,10 +64,8 @@@
  int smp_num_siblings = 1;
  /* Package ID of each logical CPU */
  u8 phys_proc_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
+ /* core ID of each logical CPU */
  u8 cpu_core_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
 -EXPORT_SYMBOL(phys_proc_id);
 -EXPORT_SYMBOL(cpu_core_id);
  
  /* Bitmask of currently online CPUs */
  cpumask_t cpu_online_map __read_mostly;

diff --cc drivers/char/agp/amd64-agp.c
Simple merge

diff --cc include/asm-i386/processor.h
Simple merge

diff --cc include/asm-x86_64/desc.h
Simple merge

diff --cc include/asm-x86_64/pgtable.h
Simple merge

diff --cc include/asm-x86_64/smp.h
Simple merge

diff --cc include/linux/gfp.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc mm/page_alloc.c
index 3c5cf664abd2eca14d2613a57023dcfcac6b6fde,259a71bacca40f0995f31d92ba73ba9f1cdb20dc..104e69ca55e0117c5ed596e9c96a01a5336a3fd8
--- 1/mm/page_alloc.c
--- 2/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -60,10 -60,14 +60,13 @@@ long nr_swap_pages
   *    NORMAL allocation will leave 784M/256 of ram reserved in the ZONE_DMA
   *    HIGHMEM allocation will leave 224M/32 of ram reserved in ZONE_NORMAL
   *    HIGHMEM allocation will (224M+784M)/256 of ram reserved in ZONE_DMA
+  *
+  * TBD: should special case ZONE_DMA32 machines here - in those we normally
+  * don't need any ZONE_NORMAL reservation
   */
- int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = { 256, 32 };
+ int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = { 256, 256, 32 };
  
  EXPORT_SYMBOL(totalram_pages);
 -EXPORT_SYMBOL(nr_swap_pages);
  
  /*
   * Used by page_zone() to look up the address of the struct zone whose