From 6fc60dbedb30193188adb9fdb4fb749c61b1fbe9 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Tue, 7 Feb 2006 13:26:14 +1100 Subject: [PATCH] --- yaml --- r: 20077 b: refs/heads/master c: f9b4045d6bbb109d066d127549b2beb38fd9bfc4 h: refs/heads/master i: 20075: 75ebd5343862a280f87ba1c6621e8d6df0d69b8e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_64.S | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4342644c36b9..11350b987588 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09f5dc44aeff9f792a807a7dca64c1791d98d8c8 +refs/heads/master: f9b4045d6bbb109d066d127549b2beb38fd9bfc4 diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S index 308268466342..415659629394 100644 --- a/trunk/arch/powerpc/kernel/head_64.S +++ b/trunk/arch/powerpc/kernel/head_64.S @@ -749,11 +749,12 @@ iSeries_secondary_smp_loop: .globl decrementer_iSeries_masked decrementer_iSeries_masked: + /* We may not have a valid TOC pointer in here. */ li r11,1 ld r12,PACALPPACAPTR(r13) stb r11,LPPACADECRINT(r12) - LOAD_REG_ADDRBASE(r12,tb_ticks_per_jiffy) - lwz r12,ADDROFF(tb_ticks_per_jiffy)(r12) + LOAD_REG_IMMEDIATE(r12, tb_ticks_per_jiffy) + lwz r12,0(r12) mtspr SPRN_DEC,r12 /* fall through */