OpenRISC fixes for 4.11
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJYy4GpAAoJEMOzHC1eZifkRm8P/jD5fc3XqdBy9hHX2x5p0mtz UNO+tHIO5wjadsf6iMcS/2Ozc8SOXdAietnCK8khodn0RvXBUEW+samSxGKNY8zO 0Oz3EcUEN3SEJ03sfMwE0G+O+LTUIgdSQ/2galTy6WqrrHVZV5Gp/z9JjDm19kUW j5U2/rqVBENSPb+nhOgeq59KpUep7RacXXLDCl34vmQKtFY2fMHa2ddOdtTEBJQh HXi7js0EfWeU6LNhMzcuUk1gwitfgNl85up2XBZmgxqe9J7Ysbosv8yH4GyrNjZU 7TOM4NTUM+LHfVQHCemJ0Ie4CJqMzafY4cdrXC6YMIB86bbLZSMw64FBINcqg8XF +RASeFbzUZO38dRccepfRxmSoOPjrN4Nsj83pzdh/4jyD1gDVuQgIPwLONZag3sU g9W7bBPPTPaRXn4MA1iyqyLwck2RIpjSMW867LXrgs6cmZXLpccW/psh/c8w08h8 8c4e++6IoiEuOp4TN0Z38TVT82apfQyfUkHepL26nI5YYgilfM8/9oPAM9l7WRSR Zyn7i3TEDX0kmt29ImUjf1ZBGIHzP3krepDkFi+gP5Xycf4sYLXjTffoqlbx9s4U 8FVdXdiXJGAE3tm+H0DvbS+oTC3eW175SfJ88GZiYog3eWWPnYyMysk/Iv2qAZuE KUR4aVx5Rb5+gJAfga2/ =lNoR -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
93afaa4513
|
@ -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 { \
|
||||||
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 @@
|
||||||
#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);
|
||||||
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
|
Загрузка…
Ссылка в новой задаче