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

Commit 39757e73 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next 

Pull arch/nios2 fixes from Ley Foon Tan:
 - add definition of ioremap_wc to io.h to fix build error from make
   allmodconfig
 - fix make defconfig
 - fix sparse error

* tag 'nios2-fixes-v3.19' of git://git.rocketboards.org/linux-socfpga-next:
  nios2/uaccess: fix sparse errors
  nios2: enable "make defconfig"
  nios2: add definition of ioremap_wc to io.h
parents 66dcff86 f1f2eac9

arch/nios2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
# Nios2 port by Wind River Systems Inc trough:

#   fredrik.markstrom@gmail.com and ivarholmqvist@gmail.com



KBUILD_DEFCONFIG := 3c120_defconfig



UTS_SYSNAME = Linux



export MMU

arch/nios2/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ static inline void iounmap(void __iomem *addr) 
	__iounmap(addr);

}



#define ioremap_wc ioremap_nocache



/* Pages to physical address... */

#define page_to_phys(page)	virt_to_phys(page_to_virt(page))

#define page_to_bus(page)	page_to_virt(page)

arch/nios2/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ do { \ 
	const __typeof__(*(ptr)) __user *__gu_ptr = (ptr);		\

	unsigned long __gu_val;						\

	__get_user_common(__gu_val, sizeof(*(ptr)), __gu_ptr, __gu_err);\

	(x) = (__typeof__(x))__gu_val;					\

	(x) = (__force __typeof__(x))__gu_val;				\

	__gu_err;							\

	})
@@ -180,7 +180,7 @@ do { \ 
	if (access_ok(VERIFY_READ,  __gu_ptr, sizeof(*__gu_ptr)))	\

		__get_user_common(__gu_val, sizeof(*__gu_ptr),		\

			__gu_ptr, __gu_err);				\

	(x) = (__typeof__(x))__gu_val;					\

	(x) = (__force __typeof__(x))__gu_val;				\

	__gu_err;							\

})