From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 15 Nov 2005 03:56:02 +0000 (-0800)
Subject: Merge x86-64 update from Andi
X-Git-Tag: v2.6.15-rc2~95
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4060994c3e337b40e0f6fa8ce2cc178e021baf3d;p=powerpc.git

Merge x86-64 update from Andi
---

4060994c3e337b40e0f6fa8ce2cc178e021baf3d
diff --cc arch/i386/kernel/smpboot.c
index bc5a9d9746,0a9c646552..d16520da45
--- a/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/x86_64/kernel/smpboot.c
index c4e59bbdc1,2b9ddba61b..683c33f7b9
--- a/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 mm/page_alloc.c
index 3c5cf664ab,259a71bacc..104e69ca55
--- a/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