From 058768a0228e53bb8619b7deebcc8de6fa5306db Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Tue, 2 Feb 2010 19:06:23 +0000
Subject: [PATCH] --- yaml --- r: 186466 b: refs/heads/master c:
 1d747c7e7b754cacb9bc8d31854bdc3a58d70597 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/parisc/include/asm/system.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0ed86b0b5e36..aa8902e05434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888c31fc83ddc7fcd9947cb67c5718b4e3dd5e1b
+refs/heads/master: 1d747c7e7b754cacb9bc8d31854bdc3a58d70597
diff --git a/trunk/arch/parisc/include/asm/system.h b/trunk/arch/parisc/include/asm/system.h
index d91357bca5b4..4653c77bf9d1 100644
--- a/trunk/arch/parisc/include/asm/system.h
+++ b/trunk/arch/parisc/include/asm/system.h
@@ -160,7 +160,7 @@ static inline void set_eiem(unsigned long val)
    ldcd). */
 
 #define __PA_LDCW_ALIGNMENT	4
-#define __ldcw_align(a) ((volatile unsigned int *)a)
+#define __ldcw_align(a) (&(a)->slock)
 #define __LDCW	"ldcw,co"
 
 #endif /*!CONFIG_PA20*/