diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 12:21:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-28 12:21:13 -0400 |
commit | 6e7d43f494463af3a5213a0a9fe5b9aa0f7856ab (patch) | |
tree | 73ac78f0a57e1fe47c1c3afc2d6ad9766af87865 /arch | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
parent | f6a12a7d0b1a70e969ae4f6d7c5201cdaf6edde0 (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze fixes from Michal Simek:
"One patch fix futex support and my patches fix warnings which were
reported by Geert's regression testing"
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Reversed logic in futex cmpxchg
microblaze: Use proper casting for inb/inw/inl in io.h
microblaze: Initialize temp variable to remove compilation warning
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/futex.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/io.h | 6 | ||||
-rw-r--r-- | arch/microblaze/kernel/cpu/cache.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h index ff8cde159d9a..01848f056f43 100644 --- a/arch/microblaze/include/asm/futex.h +++ b/arch/microblaze/include/asm/futex.h | |||
@@ -105,7 +105,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
105 | 105 | ||
106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ | 106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ |
107 | cmp %2, %1, %4; \ | 107 | cmp %2, %1, %4; \ |
108 | beqi %2, 3f; \ | 108 | bnei %2, 3f; \ |
109 | 2: swx %5, %3, r0; \ | 109 | 2: swx %5, %3, r0; \ |
110 | addic %2, r0, 0; \ | 110 | addic %2, r0, 0; \ |
111 | bnei %2, 1b; \ | 111 | bnei %2, 1b; \ |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 8cb8a8566ede..2565cb94f32f 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
@@ -123,11 +123,11 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) | |||
123 | * inb_p/inw_p/... | 123 | * inb_p/inw_p/... |
124 | * The macros don't do byte-swapping. | 124 | * The macros don't do byte-swapping. |
125 | */ | 125 | */ |
126 | #define inb(port) readb((u8 *)((port))) | 126 | #define inb(port) readb((u8 *)((unsigned long)(port))) |
127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) | 127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) |
128 | #define inw(port) readw((u16 *)((port))) | 128 | #define inw(port) readw((u16 *)((unsigned long)(port))) |
129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) | 129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) |
130 | #define inl(port) readl((u32 *)((port))) | 130 | #define inl(port) readl((u32 *)((unsigned long)(port))) |
131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) | 131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) |
132 | 132 | ||
133 | #define inb_p(port) inb((port)) | 133 | #define inb_p(port) inb((port)) |
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index 4254514b4c8c..a6e44410672d 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
@@ -140,7 +140,7 @@ do { \ | |||
140 | /* It is used only first parameter for OP - for wic, wdc */ | 140 | /* It is used only first parameter for OP - for wic, wdc */ |
141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ | 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ |
142 | do { \ | 142 | do { \ |
143 | int volatile temp; \ | 143 | int volatile temp = 0; \ |
144 | int align = ~(line_length - 1); \ | 144 | int align = ~(line_length - 1); \ |
145 | end = ((end & align) == end) ? end - line_length : end & align; \ | 145 | end = ((end & align) == end) ? end - line_length : end & align; \ |
146 | WARN_ON(end - start < 0); \ | 146 | WARN_ON(end - start < 0); \ |