diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 08:11:13 -0700 |
commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/smpprim.h | |
parent | [PATCH] sungem: fix gfp flags type (diff) | |
parent | [SUNSU]: Fix bogus locking in sunsu_change_mouse_baud() (diff) | |
download | linux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.tar.xz linux-dev-43d0b1376dc7abc29411fa31f50fe7cfb68afcd3.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/smpprim.h')
-rw-r--r-- | include/asm-sparc/smpprim.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/smpprim.h b/include/asm-sparc/smpprim.h index 9b9c28ed748e..e7b6d346ae10 100644 --- a/include/asm-sparc/smpprim.h +++ b/include/asm-sparc/smpprim.h @@ -15,7 +15,7 @@ * atomic. */ -extern __inline__ __volatile__ char test_and_set(void *addr) +static inline __volatile__ char test_and_set(void *addr) { char state = 0; @@ -27,7 +27,7 @@ extern __inline__ __volatile__ char test_and_set(void *addr) } /* Initialize a spin-lock. */ -extern __inline__ __volatile__ smp_initlock(void *spinlock) +static inline __volatile__ smp_initlock(void *spinlock) { /* Unset the lock. */ *((unsigned char *) spinlock) = 0; @@ -36,7 +36,7 @@ extern __inline__ __volatile__ smp_initlock(void *spinlock) } /* This routine spins until it acquires the lock at ADDR. */ -extern __inline__ __volatile__ smp_lock(void *addr) +static inline __volatile__ smp_lock(void *addr) { while(test_and_set(addr) == 0xff) ; @@ -46,7 +46,7 @@ extern __inline__ __volatile__ smp_lock(void *addr) } /* This routine releases the lock at ADDR. */ -extern __inline__ __volatile__ smp_unlock(void *addr) +static inline __volatile__ smp_unlock(void *addr) { *((unsigned char *) addr) = 0; } |