summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-25 07:42:22 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-25 07:42:22 -0700
commitcf025109e879294f4c6aecf94de1e7b592a9fb07 (patch)
tree05758cc7548b82c3b5d5641439f2a20480475bb1 /include
parentedec231a8a652384cb6d61e648338aa5155f2b72 (diff)
parent9a59c1860d01b3dea9ab01d5cefb9d5c52042e6d (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/mxcc.h4
-rw-r--r--include/asm-sparc64/spinlock.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/mxcc.h b/include/asm-sparc/mxcc.h
index efe4e843122d..60ef9d6fe7bc 100644
--- a/include/asm-sparc/mxcc.h
+++ b/include/asm-sparc/mxcc.h
@@ -115,8 +115,8 @@ extern __inline__ unsigned long mxcc_get_creg(void)
{
unsigned long mxcc_control;
- __asm__ __volatile__("set -1, %%g2\n\t"
- "set -1, %%g3\n\t"
+ __asm__ __volatile__("set 0xffffffff, %%g2\n\t"
+ "set 0xffffffff, %%g3\n\t"
"stda %%g2, [%1] %2\n\t"
"lda [%3] %2, %0\n\t" :
"=r" (mxcc_control) :
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h
index d1f91a4f24ae..db7581bdb531 100644
--- a/include/asm-sparc64/spinlock.h
+++ b/include/asm-sparc64/spinlock.h
@@ -44,7 +44,7 @@ typedef struct {
#define spin_unlock_wait(lp) \
do { membar("#LoadLoad"); \
-} while(lp->lock)
+} while((lp)->lock)
static inline void _raw_spin_lock(spinlock_t *lock)
{
@@ -149,7 +149,7 @@ typedef struct {
unsigned int break_lock;
#endif
} rwlock_t;
-#define RW_LOCK_UNLOCKED {0,}
+#define RW_LOCK_UNLOCKED (rwlock_t) {0,}
#define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
static void inline __read_lock(rwlock_t *lock)