From b03f39e64f9c2ba7c9401f993769a14714bbb661 Mon Sep 17 00:00:00 2001 From: will schmidt Date: Fri, 11 May 2007 23:34:16 +1000 Subject: [PATCH] --- yaml --- r: 56277 b: refs/heads/master c: e147ec8f18082efb700763bed4fe24f73ca50a2c h: refs/heads/master i: 56275: a08de7ad0840faa0accccd98d9675f0ad866bb17 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 756478818921..f0a580d73d01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 435e0b2b165bcac86eeddf675383070f60587cbb +refs/heads/master: e147ec8f18082efb700763bed4fe24f73ca50a2c diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index 7cedef8f5f70..2c8564d54e4d 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -711,30 +711,15 @@ void wakeup_decrementer(void) void __init smp_space_timers(unsigned int max_cpus) { int i; - unsigned long half = tb_ticks_per_jiffy / 2; - unsigned long offset = tb_ticks_per_jiffy / max_cpus; u64 previous_tb = per_cpu(last_jiffy, boot_cpuid); /* make sure tb > per_cpu(last_jiffy, cpu) for all cpus always */ previous_tb -= tb_ticks_per_jiffy; - /* - * The stolen time calculation for POWER5 shared-processor LPAR - * systems works better if the two threads' timebase interrupts - * are staggered by half a jiffy with respect to each other. - */ + for_each_possible_cpu(i) { if (i == boot_cpuid) continue; - if (i == (boot_cpuid ^ 1)) - per_cpu(last_jiffy, i) = - per_cpu(last_jiffy, boot_cpuid) - half; - else if (i & 1) - per_cpu(last_jiffy, i) = - per_cpu(last_jiffy, i ^ 1) + half; - else { - previous_tb += offset; - per_cpu(last_jiffy, i) = previous_tb; - } + per_cpu(last_jiffy, i) = previous_tb; } } #endif