The patch titled
Remove cpu_has() tests from user visibility in asm-i386/cpufeature.h
has been added to the -mm tree. Its filename is
remove-cpu_has-tests-from-user-visibility-in.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Remove cpu_has() tests from user visibility in asm-i386/cpufeature.h
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
'make headers_check' on i386 currently fails because asm/cpufeature.h
includes asm/bitops.h, which doesn't exist in userspace. Fix that by
putting the test_bit() parts within #ifdef __KERNEL__.
I'm not convinced we need cpufeature.h to be visible to userspace at all,
in fact -- but since it currently is, we should at least make it build in
2.6.18.
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-i386/Kbuild | 4 ++--
include/asm-i386/cpufeature.h | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN include/asm-i386/Kbuild~remove-cpu_has-tests-from-user-visibility-in include/asm-i386/Kbuild
--- a/include/asm-i386/Kbuild~remove-cpu_has-tests-from-user-visibility-in
+++ a/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
include include/asm-generic/Kbuild.asm
-header-y += boot.h cpufeature.h debugreg.h ldt.h setup.h ucontext.h
+header-y += boot.h debugreg.h ldt.h setup.h ucontext.h
-unifdef-y += mtrr.h vm86.h
+unifdef-y += mtrr.h vm86.h cpufeature.h
diff -puN include/asm-i386/cpufeature.h~remove-cpu_has-tests-from-user-visibility-in include/asm-i386/cpufeature.h
--- a/include/asm-i386/cpufeature.h~remove-cpu_has-tests-from-user-visibility-in
+++ a/include/asm-i386/cpufeature.h
@@ -7,8 +7,6 @@
#ifndef __ASM_I386_CPUFEATURE_H
#define __ASM_I386_CPUFEATURE_H
-#include <linux/bitops.h>
-
#define NCAPINTS 7 /* N 32-bit words worth of info */
/* Intel-defined CPU features, CPUID level 0x00000001 (edx), word 0 */
@@ -100,6 +98,9 @@
#define X86_FEATURE_LAHF_LM (6*32+ 0) /* LAHF/SAHF in long mode */
#define X86_FEATURE_CMP_LEGACY (6*32+ 1) /* If yes HyperThreading not valid */
+#ifdef __KERNEL__
+#include <linux/bitops.h>
+
#define cpu_has(c, bit) test_bit(bit, (c)->x86_capability)
#define boot_cpu_has(bit) test_bit(bit, boot_cpu_data.x86_capability)
@@ -134,6 +135,7 @@
#define cpu_has_phe_enabled boot_cpu_has(X86_FEATURE_PHE_EN)
#define cpu_has_pmm boot_cpu_has(X86_FEATURE_PMM)
#define cpu_has_pmm_enabled boot_cpu_has(X86_FEATURE_PMM_EN)
+#endif /* __KERNEL__ */
#endif /* __ASM_I386_CPUFEATURE_H */
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
move-linux-deviceh-include-in-linux-atmdevh-to.patch
remove-cpu_has-tests-from-user-visibility-in.patch
git-gfs2.patch
git-mtd.patch
mtd-maps-ixp4xx-partition-parsing.patch
fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch
mtd-printk-format-warning.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-mtd-nand-au1550ndc-removal-of-old-code.patch
fs-conversions-from-kmallocmemset-to-kzcalloc.patch
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
debug-shared-irqs.patch
debug-shared-irqs-kconfig-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
