diff options
| author | Anton Arapov <anton@redhat.com> | 2012-09-12 09:18:33 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-09-12 09:19:26 +0200 |
| commit | 985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2 (patch) | |
| tree | eb9091ebd60e14eea65a9e6b5140f98d88e8a590 /arch/ia64 | |
| parent | 1d44b6f3fcf6058fb7c960b7558766967e8028f7 (diff) | |
| download | kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.gz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.xz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.zip | |
fedora kernel: 021ce7bee3cfdcbf16da1256b2c9f40f7e9bbd9ev3.5.3-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/atomic.h | 4 | ||||
| -rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 7d9116600a3..6e6fe1839f5 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h @@ -17,8 +17,8 @@ #include <asm/intrinsics.h> -#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/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index 5c3e0888265..1034884b77d 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c @@ -23,7 +23,6 @@ #include <linux/ioport.h> #include <linux/kernel_stat.h> #include <linux/ptrace.h> -#include <linux/random.h> /* for rand_initialize_irq() */ #include <linux/signal.h> #include <linux/smp.h> #include <linux/threads.h> |