diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:45:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 18:45:53 -0500 |
| commit | 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 (patch) | |
| tree | fb1b7879d6e5cd5460bc256fae11c02aebd94256 /arch/parisc/include/asm/system.h | |
| parent | 5980bb3ee6e733d66eea04c221a140dea15d52de (diff) | |
| parent | 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: use __ratelimit in unaligned.c
parisc: Convert to read/update_persistent_clock
parisc: Simplify param.h by including <asm-generic/param.h>
parisc: drop unnecessary cast in __ldcw_align() macro
parisc: add strict copy size checks (v2)
parisc: remove trailing space in messages
parisc: ditto sys_accept4
parisc: wire up sys_recvmmsg
Diffstat (limited to 'arch/parisc/include/asm/system.h')
| -rw-r--r-- | arch/parisc/include/asm/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/system.h b/arch/parisc/include/asm/system.h index d91357bca5b4..4653c77bf9d1 100644 --- a/arch/parisc/include/asm/system.h +++ b/arch/parisc/include/asm/system.h | |||
| @@ -160,7 +160,7 @@ static inline void set_eiem(unsigned long val) | |||
| 160 | ldcd). */ | 160 | ldcd). */ |
| 161 | 161 | ||
| 162 | #define __PA_LDCW_ALIGNMENT 4 | 162 | #define __PA_LDCW_ALIGNMENT 4 |
| 163 | #define __ldcw_align(a) ((volatile unsigned int *)a) | 163 | #define __ldcw_align(a) (&(a)->slock) |
| 164 | #define __LDCW "ldcw,co" | 164 | #define __LDCW "ldcw,co" |
| 165 | 165 | ||
| 166 | #endif /*!CONFIG_PA20*/ | 166 | #endif /*!CONFIG_PA20*/ |