diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-09 21:29:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-09 21:29:47 -0700 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /arch/powerpc/platforms/cell/smp.c | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
| download | op-kernel-dev-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.zip op-kernel-dev-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.gz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/powerpc/platforms/cell/smp.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/smp.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index 9046803..bc97fad 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c @@ -36,7 +36,6 @@ #include <asm/prom.h> #include <asm/smp.h> #include <asm/paca.h> -#include <asm/time.h> #include <asm/machdep.h> #include <asm/cputable.h> #include <asm/firmware.h> @@ -140,31 +139,6 @@ static void __devinit smp_cell_setup_cpu(int cpu) mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER); } -static DEFINE_SPINLOCK(timebase_lock); -static unsigned long timebase = 0; - -static void __devinit cell_give_timebase(void) -{ - spin_lock(&timebase_lock); - rtas_call(rtas_token("freeze-time-base"), 0, 1, NULL); - timebase = get_tb(); - spin_unlock(&timebase_lock); - - while (timebase) - barrier(); - rtas_call(rtas_token("thaw-time-base"), 0, 1, NULL); -} - -static void __devinit cell_take_timebase(void) -{ - while (!timebase) - barrier(); - spin_lock(&timebase_lock); - set_tb(timebase >> 32, timebase & 0xffffffff); - timebase = 0; - spin_unlock(&timebase_lock); -} - static void __devinit smp_cell_kick_cpu(int nr) { BUG_ON(nr < 0 || nr >= NR_CPUS); @@ -224,8 +198,8 @@ void __init smp_init_cell(void) /* Non-lpar has additional take/give timebase */ if (rtas_token("freeze-time-base") != RTAS_UNKNOWN_SERVICE) { - smp_ops->give_timebase = cell_give_timebase; - smp_ops->take_timebase = cell_take_timebase; + smp_ops->give_timebase = rtas_give_timebase; + smp_ops->take_timebase = rtas_take_timebase; } DBG(" <- smp_init_cell()\n"); |
