Subject: [PATCH, v2] numactl: fix libnuma on big-endian 64-bit systems

From: Arnd Bergmann <[email-masked]>
Date: Thu, 4 Dec 2008 21:51:58 +0100

The read-mask function assumes that it is running in 32-bit mode,
by addressing the bitmask as a series of int values, instead of
longs. This is broken as can easily be reproduced by running numademo
on a bit-endian 64-bit system.

Changing the addressing to use 'long' values fixes the problem.

Reported-by: Mijo Safradin <[email-masked]>
Signed-off-by: Arnd Bergmann <[email-masked]>

---
 libnuma.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libnuma.c b/libnuma.c
index 4d26093..9a9fbbe 100755
--- a/libnuma.c
+++ b/libnuma.c
@@ -376,9 +376,9 @@ read_mask(char *s, struct bitmask *bmp)
 {
 	char *end = s;
 	char *prevend;
-	unsigned int *start = (unsigned int *)bmp->maskp;
-	unsigned int *p = start;
-	unsigned int *q;
+	unsigned long *start = bmp->maskp;
+	unsigned long *p = start;
+	unsigned long *q;
 	unsigned int i;
 	unsigned int n = 0;
 
@@ -415,14 +415,14 @@ read_mask(char *s, struct bitmask *bmp)
 	}
 
 	/* Poor mans fls() */
-	for(i = 31; i >= 0; i--)
+	for(i = sizeof(long) * 8 - 1; i >= 0; i--)
 		if (test_bit(i, start + n))
 			break;
 
 	/*
 	 * Return the last bit set
 	 */
-	return ((sizeof(unsigned int)*8) * n) + i;
+	return ((sizeof(unsigned long)*8) * n) + i;
 }
 
 /*