Merge x86-64 update from Andi
Linus Torvalds [Tue, 15 Nov 2005 03:56:02 +0000 (19:56 -0800)]
18 files changed:
1  2 
arch/i386/kernel/cpu/common.c
arch/i386/kernel/cpu/intel.c
arch/i386/kernel/smpboot.c
arch/ia64/Kconfig
arch/x86_64/Kconfig
arch/x86_64/Kconfig.debug
arch/x86_64/kernel/i8259.c
arch/x86_64/kernel/process.c
arch/x86_64/kernel/smpboot.c
drivers/char/agp/amd64-agp.c
include/asm-i386/processor.h
include/asm-x86_64/desc.h
include/asm-x86_64/pgtable.h
include/asm-x86_64/smp.h
include/linux/gfp.h
include/linux/mm.h
include/linux/mmzone.h
mm/page_alloc.c

Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc 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