aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-06 15:52:05 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:11:51 -0800
commit840aaef8db32572b6d11e0d5cb5e6efcbc812000 (patch)
treeaf8b8364f314d9d71c5ae81ffb48b46c53c6ae6c
parent45fec05f805a113372c9a7ff4c653ac749f6921c (diff)
[SPARC64]: Add missing memory barriers to instruction patching functions.
V9 requires a write memory barrier before the instruction flush. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/kernel/setup.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index e22bf5fc92c..40acac5b833 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -529,15 +529,19 @@ static void __init per_cpu_patch(void)
};
*(unsigned int *) (addr + 0) = insns[0];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 0));
*(unsigned int *) (addr + 4) = insns[1];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 4));
*(unsigned int *) (addr + 8) = insns[2];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 8));
*(unsigned int *) (addr + 12) = insns[3];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 12));
p++;
@@ -558,6 +562,7 @@ static void __init gl_patch(void)
unsigned long addr = p1->addr;
*(unsigned int *) (addr + 0) = p1->insn;
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 0));
p1++;
@@ -568,9 +573,11 @@ static void __init gl_patch(void)
unsigned long addr = p2->addr;
*(unsigned int *) (addr + 0) = p2->insns[0];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 0));
*(unsigned int *) (addr + 3) = p2->insns[1];
+ wmb();
__asm__ __volatile__("flush %0" : : "r" (addr + 4));
p2++;