Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e7d43f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e4aa937e f6a12a7d

arch/microblaze/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 


	__asm__ __volatile__ ("1:	lwx	%1, %3, r0;		\

					cmp	%2, %1, %4;		\

					beqi	%2, 3f;			\

					bnei	%2, 3f;			\

				2:	swx	%5, %3, r0;		\

					addic	%2, r0, 0;		\

					bnei	%2, 1b;			\

arch/microblaze/include/asm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -123,11 +123,11 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) 
 * inb_p/inw_p/...

 * The macros don't do byte-swapping.

 */

#define inb(port)		readb((u8 *)((port)))

#define inb(port)		readb((u8 *)((unsigned long)(port)))

#define outb(val, port)		writeb((val), (u8 *)((unsigned long)(port)))

#define inw(port)		readw((u16 *)((port)))

#define inw(port)		readw((u16 *)((unsigned long)(port)))

#define outw(val, port)		writew((val), (u16 *)((unsigned long)(port)))

#define inl(port)		readl((u32 *)((port)))

#define inl(port)		readl((u32 *)((unsigned long)(port)))

#define outl(val, port)		writel((val), (u32 *)((unsigned long)(port)))



#define inb_p(port)		inb((port))

arch/microblaze/kernel/cpu/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ do { \ 
/* It is used only first parameter for OP - for wic, wdc */

#define CACHE_RANGE_LOOP_1(start, end, line_length, op)			\

do {									\

	int volatile temp;						\

	int volatile temp = 0;						\

	int align = ~(line_length - 1);					\

	end = ((end & align) == end) ? end - line_length : end & align;	\

	WARN_ON(end - start < 0);					\