Commit 93afaa45 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux

Pull OpenRISC fixes from Stafford Horne:
 "OpenRISC fixes for build issues that were exposed by kbuild robots
  after 4.11 merge. All from allmodconfig builds. This includes:

   - bug in the handling of 8-byte get_user() calls

   - module build failure due to multile missing symbol exports"

* tag 'openrisc-for-linus' of git://github.com/openrisc/linux:
  openrisc: Export symbols needed by modules
  openrisc: fix issue handling 8 byte get_user calls
  openrisc: xchg: fix `computed is not used` warning
parents 3e51f893 363dad58
...@@ -78,6 +78,10 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr, ...@@ -78,6 +78,10 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr,
} }
#define xchg(ptr, with) \ #define xchg(ptr, with) \
((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), sizeof(*(ptr)))) ({ \
(__typeof__(*(ptr))) __xchg((unsigned long)(with), \
(ptr), \
sizeof(*(ptr))); \
})
#endif /* __ASM_OPENRISC_CMPXCHG_H */ #endif /* __ASM_OPENRISC_CMPXCHG_H */
...@@ -211,7 +211,7 @@ do { \ ...@@ -211,7 +211,7 @@ do { \
case 1: __get_user_asm(x, ptr, retval, "l.lbz"); break; \ case 1: __get_user_asm(x, ptr, retval, "l.lbz"); break; \
case 2: __get_user_asm(x, ptr, retval, "l.lhz"); break; \ case 2: __get_user_asm(x, ptr, retval, "l.lhz"); break; \
case 4: __get_user_asm(x, ptr, retval, "l.lwz"); break; \ case 4: __get_user_asm(x, ptr, retval, "l.lwz"); break; \
case 8: __get_user_asm2(x, ptr, retval); \ case 8: __get_user_asm2(x, ptr, retval); break; \
default: (x) = __get_user_bad(); \ default: (x) = __get_user_bad(); \
} \ } \
} while (0) } while (0)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/pgtable.h>
#define DECLARE_EXPORT(name) extern void name(void); EXPORT_SYMBOL(name) #define DECLARE_EXPORT(name) extern void name(void); EXPORT_SYMBOL(name)
...@@ -42,6 +43,9 @@ DECLARE_EXPORT(__muldi3); ...@@ -42,6 +43,9 @@ DECLARE_EXPORT(__muldi3);
DECLARE_EXPORT(__ashrdi3); DECLARE_EXPORT(__ashrdi3);
DECLARE_EXPORT(__ashldi3); DECLARE_EXPORT(__ashldi3);
DECLARE_EXPORT(__lshrdi3); DECLARE_EXPORT(__lshrdi3);
DECLARE_EXPORT(__ucmpdi2);
EXPORT_SYMBOL(empty_zero_page);
EXPORT_SYMBOL(__copy_tofrom_user); EXPORT_SYMBOL(__copy_tofrom_user);
EXPORT_SYMBOL(__clear_user);
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
...@@ -90,6 +90,7 @@ void arch_cpu_idle(void) ...@@ -90,6 +90,7 @@ void arch_cpu_idle(void)
} }
void (*pm_power_off) (void) = machine_power_off; void (*pm_power_off) (void) = machine_power_off;
EXPORT_SYMBOL(pm_power_off);
/* /*
* When a process does an "exec", machine state like FPU and debug * When a process does an "exec", machine state like FPU and debug
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment