forked from pool/numactl
This commit is contained in:
parent
d704efec15
commit
9488f125d9
51
numactl-64bit-bigendian.diff
Normal file
51
numactl-64bit-bigendian.diff
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
From: Arnd Bergmann <arnd@arndb.de>
|
||||||
|
Subject: Fix libnuma on big-endian 64-bit systems
|
||||||
|
References: bnc #455977
|
||||||
|
|
||||||
|
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 <safradin@de.ibm.com>
|
||||||
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||||||
|
Acked-by: Bernhard Walle <bwalle@suse.de>
|
||||||
|
|
||||||
|
---
|
||||||
|
libnuma.c | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
--- a/libnuma.c
|
||||||
|
+++ b/libnuma.c
|
||||||
|
@@ -372,9 +372,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;
|
||||||
|
|
||||||
|
@@ -411,14 +411,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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 5 14:38:41 CET 2008 - bwalle@suse.de
|
||||||
|
|
||||||
|
- Fix numademo memset fails with 'mbind: Invalid argument'
|
||||||
|
(bnc #455977).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 20 11:58:59 CET 2008 - bwalle@suse.de
|
Thu Nov 20 11:58:59 CET 2008 - bwalle@suse.de
|
||||||
|
|
||||||
|
@ -23,14 +23,15 @@ Name: numactl
|
|||||||
License: GPL v2 only; GPL v2 or later
|
License: GPL v2 only; GPL v2 or later
|
||||||
Summary: NUMA Policy Control
|
Summary: NUMA Policy Control
|
||||||
Version: 2.0.2
|
Version: 2.0.2
|
||||||
Release: 16
|
Release: 17
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Source: numactl-%{version}.tar.bz2
|
Source: numactl-%{version}.tar.bz2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
ExclusiveArch: ia64 x86_64 ppc64 ppc
|
ExclusiveArch: ia64 x86_64 ppc64 ppc
|
||||||
Requires: perl
|
Requires: perl
|
||||||
Patch0: numactl-compat.diff
|
Patch0: %{name}-compat.diff
|
||||||
|
Patch1: %{name}-64bit-bigendian.diff
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Control NUMA policy for individual processes. Offer libnuma for
|
Control NUMA policy for individual processes. Offer libnuma for
|
||||||
@ -81,6 +82,7 @@ Authors:
|
|||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make CFLAGS="${RPM_OPT_FLAGS}"
|
make CFLAGS="${RPM_OPT_FLAGS}"
|
||||||
@ -120,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/lib*so
|
%{_libdir}/lib*so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 05 2008 bwalle@suse.de
|
||||||
|
- Fix numademo memset fails with 'mbind: Invalid argument'
|
||||||
|
(bnc #455977).
|
||||||
* Thu Nov 20 2008 bwalle@suse.de
|
* Thu Nov 20 2008 bwalle@suse.de
|
||||||
- Fixes to libnuma.c numa.h numacompat1.h by Daniel Gollub to fix
|
- Fixes to libnuma.c numa.h numacompat1.h by Daniel Gollub to fix
|
||||||
v1 compatiblity (bnc#441440).
|
v1 compatiblity (bnc#441440).
|
||||||
|
Loading…
Reference in New Issue
Block a user