summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 13:16:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 13:16:01 -0700
commit1bda20da20e5c64919efcb507a84e192deed1c60 (patch)
treec0c6942fad5f73db57c02ac46dbc80657a67d772 /arch/ia64
parent4de9ad9bc08b4953fc03336ad38908496e2f8826 (diff)
parent44fd81fe7eb8029a37ec83f15d4ef3585dd81bb6 (diff)
downloadop-kernel-dev-1bda20da20e5c64919efcb507a84e192deed1c60.zip
op-kernel-dev-1bda20da20e5c64919efcb507a84e192deed1c60.tar.gz
Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fixes from Tony Luck: "Couple of small cleanups for ia64" * tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Use asm-generic/bitops/builtin-ffs.h [IA64] dmi.h: Make dmi_alloc use kzalloc
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/bitops.h8
-rw-r--r--arch/ia64/include/asm/dmi.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index 8e20bff..c27eccd 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -425,13 +425,7 @@ __fls (unsigned long x)
#include <asm-generic/bitops/fls64.h>
-/*
- * 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 <asm-generic/bitops/builtin-ffs.h>
/*
* hweightN: returns the hamming weight (i.e. the number
diff --git a/arch/ia64/include/asm/dmi.h b/arch/ia64/include/asm/dmi.h
index 1ed4c8f..185d3d1 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
OpenPOWER on IntegriCloud