summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBorislav Petkov <bp@alien8.de>2010-06-09 11:04:16 +0300
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-10 15:24:30 -0700
commit055c47272b8f5679d08ccc57efea3cb4aaeb5fc6 (patch)
tree71cf77bf125f294fb30f2ff9c7f057986aaa21e1 /arch
parentcf3bdc29fcbf2cb4cfa238591021d41ea8f8431f (diff)
downloadlinux-stable-055c47272b8f5679d08ccc57efea3cb4aaeb5fc6.tar.gz
linux-stable-055c47272b8f5679d08ccc57efea3cb4aaeb5fc6.tar.bz2
linux-stable-055c47272b8f5679d08ccc57efea3cb4aaeb5fc6.zip
um, hweight: Fix UML boot crash due to x86 optimized hweight
Apparently UML cannot stomach callee reg-saving trickery introduced with d61931d89be506372d01a90d1755f6d0a9fafe2d (x86: Add optimized popcnt variants) and oopses during boot: http://marc.info/?l=linux-kernel&m=127522065202435&w=2 Redirect arch_hweight.h include from the x86 portion to the generic arch_hweight.h which is a fallback to the software hweight routines. LKML-Reference: <201005271944.09541.toralf.foerster@gmx.de> Signed-off-by: Borislav Petkov <bp@alien8.de> LKML-Reference: <4C0F4B00.4090307@panasas.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/include/asm/arch_hweight.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/include/asm/arch_hweight.h b/arch/um/include/asm/arch_hweight.h
new file mode 100644
index 000000000000..c656cf443f4a
--- /dev/null
+++ b/arch/um/include/asm/arch_hweight.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_UM_HWEIGHT_H
+#define _ASM_UM_HWEIGHT_H
+
+#include <asm-generic/bitops/arch_hweight.h>
+
+#endif