Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Rusty Russell [Mon, 29 Dec 2008 21:32:35 +0000 (07:32 +1030)]
24 files changed:
1  2 
arch/m32r/Kconfig
arch/powerpc/kernel/smp.c
arch/powerpc/kernel/time.c
arch/powerpc/platforms/pseries/xics.c
arch/powerpc/sysdev/mpic.c
arch/s390/Kconfig
arch/s390/kernel/smp.c
arch/s390/kernel/time.c
arch/s390/kernel/topology.c
arch/x86/include/asm/pci.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/hpet.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/irq_64.c
arch/x86/kernel/smpboot.c
arch/x86/lguest/boot.c
include/linux/smp.h
init/Kconfig
kernel/profile.c
kernel/sched.c
kernel/sched_stats.h
kernel/trace/trace.c
lib/Kconfig

Simple merge
  #define DBG(fmt...)
  #endif
  
- int smp_hw_index[NR_CPUS];
  struct thread_info *secondary_ti;
  
 -cpumask_t cpu_possible_map = CPU_MASK_NONE;
 -cpumask_t cpu_online_map = CPU_MASK_NONE;
  DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
  DEFINE_PER_CPU(cpumask_t, cpu_core_map) = CPU_MASK_NONE;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
diff --cc lib/Kconfig
Simple merge