diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-04-11 01:10:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:28:53 -0400 |
commit | cb8c181f288a1157bc717cc7a02412d4d1dc19bc (patch) | |
tree | cfc2ee0d9644d43ab7728a8e563be320d3348a45 /arch/s390 | |
parent | efd1e8d569b3d35a3a636683c2a9ebffec9c1fcf (diff) |
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/s390/lib/div64.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile index 7a44fed21b35..59aea65ce99f 100644 --- a/arch/s390/lib/Makefile +++ b/arch/s390/lib/Makefile | |||
@@ -5,6 +5,6 @@ | |||
5 | EXTRA_AFLAGS := -traditional | 5 | EXTRA_AFLAGS := -traditional |
6 | 6 | ||
7 | lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o | 7 | lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o |
8 | lib-$(CONFIG_32BIT) += div64.o | 8 | obj-$(CONFIG_32BIT) += div64.o |
9 | lib-$(CONFIG_64BIT) += uaccess_mvcos.o | 9 | lib-$(CONFIG_64BIT) += uaccess_mvcos.o |
10 | lib-$(CONFIG_SMP) += spinlock.o | 10 | lib-$(CONFIG_SMP) += spinlock.o |
diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c index 0481f3424a13..a5f8300bf3ee 100644 --- a/arch/s390/lib/div64.c +++ b/arch/s390/lib/div64.c | |||
@@ -147,5 +147,3 @@ uint32_t __div64_32(uint64_t *n, uint32_t base) | |||
147 | } | 147 | } |
148 | 148 | ||
149 | #endif /* MARCH_G5 */ | 149 | #endif /* MARCH_G5 */ |
150 | |||
151 | EXPORT_SYMBOL(__div64_32); | ||