From 9294a11771b69264f9c16d254782f6938de4169f Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Fri, 15 Jan 2010 17:41:35 +0100 Subject: [PATCH] --- yaml --- r: 181923 b: refs/heads/master c: 51adc548cb0b2441ee9d4c428a84b77021f4d3fa h: refs/heads/master i: 181921: 4d65e161356a45bc78958032fc701d17a138dabe 181919: f67adc227e28508394ee874406e230916562d2d9 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_fsl_booke.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 05dd8a2fd082..fb4393d53f41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292 +refs/heads/master: 51adc548cb0b2441ee9d4c428a84b77021f4d3fa diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S index 7f4bd7f3b6af..25793bb0e782 100644 --- a/trunk/arch/powerpc/kernel/head_fsl_booke.S +++ b/trunk/arch/powerpc/kernel/head_fsl_booke.S @@ -214,11 +214,11 @@ skpinv: addi r6,r6,1 /* Increment */ bl 1f /* Find our address */ 1: mflr r9 rlwimi r7,r9,0,20,31 - addi r7,r7,24 + addi r7,r7,(2f - 1b) mtspr SPRN_SRR0,r7 mtspr SPRN_SRR1,r6 rfi - +2: /* 4. Clear out PIDs & Search info */ li r6,0 mtspr SPRN_MAS6,r6