Commit 1bda20da authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4de9ad9b 44fd81fe
...@@ -425,13 +425,7 @@ __fls (unsigned long x) ...@@ -425,13 +425,7 @@ __fls (unsigned long x)
#include <asm-generic/bitops/fls64.h> #include <asm-generic/bitops/fls64.h>
/* #include <asm-generic/bitops/builtin-ffs.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)
/* /*
* hweightN: returns the hamming weight (i.e. the number * hweightN: returns the hamming weight (i.e. the number
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
/* Use normal IO mappings for DMI */ /* Use normal IO mappings for DMI */
#define dmi_ioremap ioremap #define dmi_ioremap ioremap
#define dmi_iounmap(x,l) iounmap(x) #define dmi_iounmap(x,l) iounmap(x)
#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC) #define dmi_alloc(l) kzalloc(l, GFP_ATOMIC)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment