diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-09-17 17:07:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-09-17 17:07:46 -0400 |
| commit | ad501d18302427a48fee3502d03cfa385d0adf9b (patch) | |
| tree | 6cb9fa20c8dc7acc8741375c42edbe0c0b0407b9 /arch/alpha | |
| parent | 46186fd78b95d2a02232485597ec03771527710d (diff) | |
| parent | 21094cfa0c0cc2ebbef5f5cdb04dbf7675aafb0e (diff) | |
Merge tag 'v3.2.29' into v3.2-rt
This is the 3.2.29 stable release
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/atomic.h | 4 | ||||
| -rw-r--r-- | arch/alpha/include/asm/socket.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index 640f909ddd41..6f1aca7681fb 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h @@ -14,8 +14,8 @@ */ -#define ATOMIC_INIT(i) ( (atomic_t) { (i) } ) -#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } ) +#define ATOMIC_INIT(i) { (i) } +#define ATOMIC64_INIT(i) { (i) } #define atomic_read(v) (*(volatile int *)&(v)->counter) #define atomic64_read(v) (*(volatile long *)&(v)->counter) diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h index 06edfefc3373..3eeb47c50189 100644 --- a/arch/alpha/include/asm/socket.h +++ b/arch/alpha/include/asm/socket.h @@ -69,9 +69,11 @@ #define SO_RXQ_OVFL 40 +#ifdef __KERNEL__ /* O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */ #define SOCK_NONBLOCK 0x40000000 +#endif /* __KERNEL__ */ #endif /* _ASM_SOCKET_H */ |