From 52ae66387c895df8e88ff20dfd318c17416d8484 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 6 May 2010 19:46:50 +0000 Subject: [PATCH] --- yaml --- r: 196657 b: refs/heads/master c: e62cee42e66dcca83aae02748535f62e0f564a0c h: refs/heads/master i: 196655: a3f5124d4a3c4e642289a982a67ea953f53ec567 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/exception.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b1840f549b9a..d2f9ef15fb7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abb17f9c3a92c5acf30e749efdf0419b7f50a5b8 +refs/heads/master: e62cee42e66dcca83aae02748535f62e0f564a0c diff --git a/trunk/arch/powerpc/platforms/iseries/exception.S b/trunk/arch/powerpc/platforms/iseries/exception.S index fba5bf915073..32a56c6dfa72 100644 --- a/trunk/arch/powerpc/platforms/iseries/exception.S +++ b/trunk/arch/powerpc/platforms/iseries/exception.S @@ -252,8 +252,8 @@ decrementer_iSeries_masked: li r11,1 ld r12,PACALPPACAPTR(r13) stb r11,LPPACADECRINT(r12) - LOAD_REG_IMMEDIATE(r12, tb_ticks_per_jiffy) - lwz r12,0(r12) + li r12,-1 + clrldi r12,r12,33 /* set DEC to 0x7fffffff */ mtspr SPRN_DEC,r12 /* fall through */