From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 29 Dec 2008 21:32:35 +0000 (+1030)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.29-rc1~521^2~11^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=33edcf133ba93ecba2e4b6472e97b689895d805c;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

33edcf133ba93ecba2e4b6472e97b689895d805c
diff --cc arch/powerpc/kernel/smp.c
index d1165566f06,8ac3f721d23..65484b2200b
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -57,9 -57,10 +57,8 @@@
  #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;