From ab10596f8a45cf19f5482af2a64f4bd4e5bf88c0 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 9 Jul 2013 10:13:03 -0700 Subject: [PATCH 1/2] [IA64] dmi.h: Make dmi_alloc use kzalloc x86/ia64 have a slight mismatch in dmi_alloc as x86 does a memset(0), and ia64 just does kmalloc. Make the ia64 dmi_alloc match the x86 style. Signed-off-by: Joe Perches Signed-off-by: Tony Luck --- arch/ia64/include/asm/dmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ia64/include/asm/dmi.h b/arch/ia64/include/asm/dmi.h index 1ed4c8fedb83..185d3d18d0ec 100644 --- a/arch/ia64/include/asm/dmi.h +++ b/arch/ia64/include/asm/dmi.h @@ -7,6 +7,6 @@ /* Use normal IO mappings for DMI */ #define dmi_ioremap ioremap #define dmi_iounmap(x,l) iounmap(x) -#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC) +#define dmi_alloc(l) kzalloc(l, GFP_ATOMIC) #endif From 44fd81fe7eb8029a37ec83f15d4ef3585dd81bb6 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Wed, 14 Aug 2013 22:06:59 +0900 Subject: [PATCH 2/2] [IA64] Use asm-generic/bitops/builtin-ffs.h The definition of ffs() for ia64 is almost the same as asm-generic/bitops/builtin-ffs.h. The only difference is whether it is defined as inline function or macro function. So this switches to use the header (both to reduce amount of arch specific code, and because inline functions provide type-checking that macros do not). Signed-off-by: Akinobu Mita Signed-off-by: Tony Luck --- arch/ia64/include/asm/bitops.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h index 8e20bff39f79..c27eccd33349 100644 --- a/arch/ia64/include/asm/bitops.h +++ b/arch/ia64/include/asm/bitops.h @@ -425,13 +425,7 @@ __fls (unsigned long x) #include -/* - * ffs: find first bit set. This is defined the same way as the libc and - * compiler builtin ffs routines, therefore differs in spirit from the above - * ffz (man ffs): it operates on "int" values only and the result value is the - * bit number + 1. ffs(0) is defined to return zero. - */ -#define ffs(x) __builtin_ffs(x) +#include /* * hweightN: returns the hamming weight (i.e. the number