PARISC: provide __ucmpdi2
diff mbox

Message ID BLU0-SMTP16CB97A849149145EF5FC997C90@phx.gbl
State Accepted, archived
Headers show

Commit Message

John David Anglin April 20, 2013, 7:41 p.m. UTC
Provide __ucmpdi2 to resolve undefined references in 32 bit builds.

The Debian experimental linux source package (3.8.5-1) build fails  
with the following errors:
...
MODPOST 2016 modules
ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!

The attached patch resolves this problem.  It is based on the s390  
implementation
of ucmpdi2.c.

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
---

Dave
--
John David Anglin	dave.anglin@bell.net

Comments

Rolf Eike Beer April 20, 2013, 7:51 p.m. UTC | #1
Am Samstag 20 April 2013, 15:41:06 schrieb John David Anglin:
> Provide __ucmpdi2 to resolve undefined references in 32 bit builds.
> 
> The Debian experimental linux source package (3.8.5-1) build fails
> with the following errors:
> ...
> MODPOST 2016 modules
> ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
> ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!
> 
> The attached patch resolves this problem.  It is based on the s390
> implementation
> of ucmpdi2.c.
> 
> Signed-off-by: John David Anglin <dave.anglin@bell.net>
> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
> Cc: Helge Deller <deller@gmx.de>

If this is in 3.8.5 this should also get a Cc:stable@kernel.org

Eike
John David Anglin April 20, 2013, 7:52 p.m. UTC | #2
On 20-Apr-13, at 3:51 PM, Rolf Eike Beer wrote:

> Am Samstag 20 April 2013, 15:41:06 schrieb John David Anglin:
>> Provide __ucmpdi2 to resolve undefined references in 32 bit builds.
>>
>> The Debian experimental linux source package (3.8.5-1) build fails
>> with the following errors:
>> ...
>> MODPOST 2016 modules
>> ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
>> ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!
>>
>> The attached patch resolves this problem.  It is based on the s390
>> implementation
>> of ucmpdi2.c.
>>
>> Signed-off-by: John David Anglin <dave.anglin@bell.net>
>> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
>> Cc: Helge Deller <deller@gmx.de>
>
> If this is in 3.8.5 this should also get a Cc:stable@kernel.org


It is not in anything.

Dave
--
John David Anglin	dave.anglin@bell.net



--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rolf Eike Beer April 20, 2013, 8:02 p.m. UTC | #3
Am Samstag 20 April 2013, 15:52:59 schrieb John David Anglin:
> On 20-Apr-13, at 3:51 PM, Rolf Eike Beer wrote:
> > Am Samstag 20 April 2013, 15:41:06 schrieb John David Anglin:
> >> Provide __ucmpdi2 to resolve undefined references in 32 bit builds.
> >> 
> >> The Debian experimental linux source package (3.8.5-1) build fails
> >> with the following errors:
> >> ...
> >> MODPOST 2016 modules
> >> ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
> >> ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!
> >> 
> >> The attached patch resolves this problem.  It is based on the s390
> >> implementation
> >> of ucmpdi2.c.
> >> 
> >> Signed-off-by: John David Anglin <dave.anglin@bell.net>
> >> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
> >> Cc: Helge Deller <deller@gmx.de>
> > 
> > If this is in 3.8.5 this should also get a Cc:stable@kernel.org
> 
> It is not in anything.

The function? Or the error? If the function is missing, i.e. the error will 
happen once enabling e.g. btrfs, in a already released kernel we should get 
this into stable.

Eike
John David Anglin April 20, 2013, 8:26 p.m. UTC | #4
On 20-Apr-13, at 4:02 PM, Rolf Eike Beer wrote:

> Am Samstag 20 April 2013, 15:52:59 schrieb John David Anglin:
>> On 20-Apr-13, at 3:51 PM, Rolf Eike Beer wrote:
>>> Am Samstag 20 April 2013, 15:41:06 schrieb John David Anglin:
>>>> Provide __ucmpdi2 to resolve undefined references in 32 bit builds.
>>>>
>>>> The Debian experimental linux source package (3.8.5-1) build fails
>>>> with the following errors:
>>>> ...
>>>> MODPOST 2016 modules
>>>> ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
>>>> ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!
>>>>
>>>> The attached patch resolves this problem.  It is based on the s390
>>>> implementation
>>>> of ucmpdi2.c.
>>>>
>>>> Signed-off-by: John David Anglin <dave.anglin@bell.net>
>>>> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
>>>> Cc: Helge Deller <deller@gmx.de>
>>>
>>> If this is in 3.8.5 this should also get a Cc:stable@kernel.org
>>
>> It is not in anything.
>
> The function? Or the error? If the function is missing, i.e. the  
> error will
> happen once enabling e.g. btrfs, in a already released kernel we  
> should get
> this into stable.

The error is probably in all active stable branches given that most  
ports provide the function.
GCC generates a call to __ucmpdi2 if the backend doesn't support  
unsigned 64-bit compares.
Normally, the function is resolved by libgcc.  I have no objection to  
pushing the patch back
but Helge and James usually decide this.

Dave
--
John David Anglin	dave.anglin@bell.net



--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 6795dc6..568b2c6 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -120,11 +120,13 @@  extern void __ashrdi3(void);
 extern void __ashldi3(void);
 extern void __lshrdi3(void);
 extern void __muldi3(void);
+extern void __ucmpdi2(void);
 
 EXPORT_SYMBOL(__ashrdi3);
 EXPORT_SYMBOL(__ashldi3);
 EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
+EXPORT_SYMBOL(__ucmpdi2);
 
 asmlinkage void * __canonicalize_funcptr_for_compare(void *);
 EXPORT_SYMBOL(__canonicalize_funcptr_for_compare);
diff --git a/arch/parisc/lib/Makefile b/arch/parisc/lib/Makefile
index 5f2e690..5651536 100644
--- a/arch/parisc/lib/Makefile
+++ b/arch/parisc/lib/Makefile
@@ -2,6 +2,7 @@ 
 # Makefile for parisc-specific library files
 #
 
-lib-y	:= lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o
+lib-y	:= lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o \
+	   ucmpdi2.o
 
 obj-y	:= iomap.o
--- /dev/null	2013-04-18 22:44:06.316000000 -0400
+++ linux/arch/parisc/lib/ucmpdi2.c	2013-04-20 10:50:01.000000000 -0400
@@ -0,0 +1,25 @@ 
+#include <linux/module.h>
+
+union ull_union {
+	unsigned long long ull;
+	struct {
+		unsigned int high;
+		unsigned int low;
+	} ui;
+};
+
+int __ucmpdi2(unsigned long long a, unsigned long long b)
+{
+	union ull_union au = {.ull = a};
+	union ull_union bu = {.ull = b};
+
+	if (au.ui.high < bu.ui.high)
+		return 0;
+	else if (au.ui.high > bu.ui.high)
+		return 2;
+	if (au.ui.low < bu.ui.low)
+		return 0;
+	else if (au.ui.low > bu.ui.low)
+		return 2;
+	return 1;
+}