AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 03:20:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

nios2 fixes for v3.19

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
 iQIVAwUAVJEcKFWoEK+e3syCAQL4Jw/9HlIgg2mo1CPfNAqHpDaa2lZML7Gkp7GA
 fYAz/MPXpU3qAk08hRUWbRzZMIgkK7ngEE0AaiuakgTEqxjdbgjJTAtxi77TnIXW
 pkktwufl3E3GvKO7ehXHi6o7kr5TEM0w/Rv1wzRRk5uNqA6YlpDvD9MLYvxulAyQ
 FYtnNNvWtIbB7htXYODS9DZscCleuMWQ/oc8B1Vu6LMiFofNjgWAPOnNzu7jNy1v
 6oZvolsmCA/2nbEYvePYY8kr+yqMn2qZmC0hujWbakJx4zPbK6dpuATskXWz3GlN
 5No3hezUvZ56DrCOqC0HDPWMcEh5Ht56jIP9XSxjCBMzKXdaEMnjT6Vi9p3hw0nP
 3BcgfKPVnG0UPjKcggqmTVL/oaiN4Yks/g5aIg9zPkAzgN9D4RCbujSiprTbyYxz
 IsibspAgctS/ZwKuMY/s3970ewsKisqR8G54N3tWf4BCc/gLPigHwJ00Z2/ksEDh
 iVvoK/3S2kyLKD2rtXgsmFEdzxk3CskJkAFugPlgMr1SLxKPdKehl6Ku4wBmarBL
 c0oYFOWSg63bzja6JPqXWiNIzdy1eJiki4vTmS5g+IUe5fDbBzR64EOtnsHiM0y/
 QR5rC12VSONtOS9u33J6fd73nGr+L0NVRr7HEXKKelho0YTVV0s+gP1XraZOkOUa
 OGM0waMtpFU=
 =4TE/
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-12-18 16:13:40 -08:00
commit 39757e7351
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/nios2/Makefile
View File

@ -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

2
arch/nios2/include/asm/io.h
View File

@ -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)

4
arch/nios2/include/asm/uaccess.h
View File

@ -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; \
})