From e48501730eb08d2e07d262e1d7045f9cfde534e6 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Wed, 10 Dec 2008 14:28:41 +0000 Subject: [PATCH] --- yaml --- r: 123081 b: refs/heads/master c: 13a9801eb669d567ab2c8f8db5e50557fef5f636 h: refs/heads/master i: 123079: 6b6b4657599ce55e27ae234cf1600fb61d56f26b v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup_32.c | 2 ++ trunk/arch/powerpc/kernel/smp.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 42fcfa30ca2f..d2ab9c5cb71a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b82b3e4b54b2fce2ca11976c535012b836b2016 +refs/heads/master: 13a9801eb669d567ab2c8f8db5e50557fef5f636 diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c index cc4679ed9527..086c23c1ee5e 100644 --- a/trunk/arch/powerpc/kernel/setup_32.c +++ b/trunk/arch/powerpc/kernel/setup_32.c @@ -49,6 +49,8 @@ int boot_cpuid; EXPORT_SYMBOL_GPL(boot_cpuid); int boot_cpuid_phys; +int smp_hw_index[NR_CPUS]; + unsigned long ISA_DMA_THRESHOLD; unsigned int DMA_MODE_READ; unsigned int DMA_MODE_WRITE; diff --git a/trunk/arch/powerpc/kernel/smp.c b/trunk/arch/powerpc/kernel/smp.c index a59d8d72bb97..ffcb1779a220 100644 --- a/trunk/arch/powerpc/kernel/smp.c +++ b/trunk/arch/powerpc/kernel/smp.c @@ -57,7 +57,6 @@ #define DBG(fmt...) #endif -int smp_hw_index[NR_CPUS]; struct thread_info *secondary_ti; cpumask_t cpu_possible_map = CPU_MASK_NONE;