Commit cb8c181f authored by David S. Miller's avatar David S. Miller

[S390]: Fix build on 31-bit.

Allow s390 to properly override the generic
__div64_32() implementation by:

1) Using obj-y for div64.o in s390's makefile instead
   of lib-y

2) Adding the weak attribute to the generic implementation.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efd1e8d5
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional
lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o
lib-$(CONFIG_32BIT) += div64.o obj-$(CONFIG_32BIT) += div64.o
lib-$(CONFIG_64BIT) += uaccess_mvcos.o lib-$(CONFIG_64BIT) += uaccess_mvcos.o
lib-$(CONFIG_SMP) += spinlock.o lib-$(CONFIG_SMP) += spinlock.o
...@@ -147,5 +147,3 @@ uint32_t __div64_32(uint64_t *n, uint32_t base) ...@@ -147,5 +147,3 @@ uint32_t __div64_32(uint64_t *n, uint32_t base)
} }
#endif /* MARCH_G5 */ #endif /* MARCH_G5 */
EXPORT_SYMBOL(__div64_32);
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* Not needed on 64bit architectures */ /* Not needed on 64bit architectures */
#if BITS_PER_LONG == 32 #if BITS_PER_LONG == 32
uint32_t __div64_32(uint64_t *n, uint32_t base) uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
{ {
uint64_t rem = *n; uint64_t rem = *n;
uint64_t b = base; uint64_t b = base;
......
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