diff options
| author | Steve French | 2005-06-06 19:31:45 +0200 |
|---|---|---|
| committer | Steve French | 2005-06-06 19:31:45 +0200 |
| commit | 2830077f7ae93ef2f7a312e3e489110963612e77 (patch) | |
| tree | 039fea827a1376552ef89ab686168947e3558069 /arch/ppc64/kernel/smp.c | |
| parent | [CIFS] fs/cifs/netmisc.c: fix sparse warning (diff) | |
| parent | Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2... (diff) | |
| download | kernel-qcow2-linux-2830077f7ae93ef2f7a312e3e489110963612e77.tar.gz kernel-qcow2-linux-2830077f7ae93ef2f7a312e3e489110963612e77.tar.xz kernel-qcow2-linux-2830077f7ae93ef2f7a312e3e489110963612e77.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'arch/ppc64/kernel/smp.c')
| -rw-r--r-- | arch/ppc64/kernel/smp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c index 3b906cd94037..9ef5d36d6b25 100644 --- a/arch/ppc64/kernel/smp.c +++ b/arch/ppc64/kernel/smp.c @@ -334,7 +334,6 @@ void smp_call_function_interrupt(void) } } -extern unsigned long decr_overclock; extern struct gettimeofday_struct do_gtod; struct thread_info *current_set[NR_CPUS]; @@ -491,7 +490,7 @@ int __devinit __cpu_up(unsigned int cpu) if (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)) return -EINVAL; - paca[cpu].default_decr = tb_ticks_per_jiffy / decr_overclock; + paca[cpu].default_decr = tb_ticks_per_jiffy; if (!cpu_has_feature(CPU_FTR_SLB)) { void *tmp; |