diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-12 18:39:55 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-12 18:39:55 -0400 |
commit | 95ff54f5176a36f65522e46c670a571728328b10 (patch) | |
tree | ab569ddca890ff70c4770e4376f119355c042695 /arch | |
parent | 9cf7f7fac8c36e54e4869fc01e1bad0d3b4de53b (diff) |
[POWERPC] Add __ucmpdi2 for 64-bit comparisons in 32-bit kernels
Some drivers (such as V4L2) have code that causes gcc to generate
calls to __ucmpdi2 when compiling for 32-bit powerpc, which results
in either a link-time error or a module that can't be loaded, as
we don't currently have a __ucmpdi2. This adds one so these drivers
can be used.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/misc_32.S | 15 | ||||
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 5c2e253ddfb1..9d2c56621f1e 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
@@ -785,6 +785,21 @@ _GLOBAL(__lshrdi3) | |||
785 | or r4,r4,r7 # LSW |= t2 | 785 | or r4,r4,r7 # LSW |= t2 |
786 | blr | 786 | blr |
787 | 787 | ||
788 | /* | ||
789 | * 64-bit comparison: __ucmpdi2(u64 a, u64 b) | ||
790 | * Returns 0 if a < b, 1 if a == b, 2 if a > b. | ||
791 | */ | ||
792 | _GLOBAL(__ucmpdi2) | ||
793 | cmplw r3,r5 | ||
794 | li r3,1 | ||
795 | bne 1f | ||
796 | cmplw r4,r6 | ||
797 | beqlr | ||
798 | 1: li r3,0 | ||
799 | bltlr | ||
800 | li r3,2 | ||
801 | blr | ||
802 | |||
788 | _GLOBAL(abs) | 803 | _GLOBAL(abs) |
789 | srawi r4,r3,31 | 804 | srawi r4,r3,31 |
790 | xor r3,r3,r4 | 805 | xor r3,r3,r4 |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index aa9ff35b0e63..3e52122c5073 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -149,6 +149,8 @@ long long __lshrdi3(long long, int); | |||
149 | EXPORT_SYMBOL(__ashrdi3); | 149 | EXPORT_SYMBOL(__ashrdi3); |
150 | EXPORT_SYMBOL(__ashldi3); | 150 | EXPORT_SYMBOL(__ashldi3); |
151 | EXPORT_SYMBOL(__lshrdi3); | 151 | EXPORT_SYMBOL(__lshrdi3); |
152 | int __ucmpdi2(unsigned long long, unsigned long long); | ||
153 | EXPORT_SYMBOL(__ucmpdi2); | ||
152 | #endif | 154 | #endif |
153 | 155 | ||
154 | EXPORT_SYMBOL(memcpy); | 156 | EXPORT_SYMBOL(memcpy); |