Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c

1 files changed, 21 insertions, 0 deletions

diff --git a/tools/perf/util/bitmap.c b/tools/perf/util/bitmap.c
new file mode 100644
index 000000000000..5e230acae1e9
--- /dev/null
+++ b/tools/perf/util/bitmap.c
@@ -0,0 +1,21 @@
+/*
+ * From lib/bitmap.c
+ * Helper functions for bitmap.h.
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+#include <linux/bitmap.h>
+
+int __bitmap_weight(const unsigned long *bitmap, int bits)
+{
+        int k, w = 0, lim = bits/BITS_PER_LONG;
+
+        for (k = 0; k < lim; k++)
+                w += hweight_long(bitmap[k]);
+
+        if (bits % BITS_PER_LONG)
+                w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
+
+        return w;
+}