Bug#377002: linux-kernel-headers: #include <sys/vm86.h> does not define VM_MASK correctly unless CONFIG_VM86 is defined
Package: linux-kernel-headers
Version: 2.6.17.1-1
Severity: normal
Tags: patch
<sys/vm86.h> includes <asm/vm86.h>, which includes <asm-i486/vm86.h>.
The last file depends on the kernel configuration constant
#ifdef CONFIG_VM86
#define VM_MASK 0x00020000
#else
#define VM_MASK 0 /* ignored */
#endif
CONFIG_VM86 which makes no sense in user space.
--- include/asm-i486/vm86.h~ 2006-07-01 09:37:31.000000000 +1200
+++ include/asm-i486/vm86.h 2006-07-01 09:43:37.000000000 +1200
@@ -16,11 +16,7 @@
#define IF_MASK 0x00000200
#define IOPL_MASK 0x00003000
#define NT_MASK 0x00004000
-#ifdef CONFIG_VM86
#define VM_MASK 0x00020000
-#else
-#define VM_MASK 0 /* ignored */
-#endif
#define AC_MASK 0x00040000
#define VIF_MASK 0x00080000 /* virtual interrupt flag */
#define VIP_MASK 0x00100000 /* virtual interrupt pending */
@@ -137,6 +133,12 @@
};
#ifdef __KERNEL__
+
+#ifndef CONFIG_VM86
+#undef VM_MASK
+#define VM_MASK 0 /* ignored */
+#endif
+
/*
* This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86
* mode - the main change is that the old segment descriptors aren't
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17
Locale: LANG=en_NZ, LC_CTYPE=en_NZ (charmap=ISO-8859-1)
-- no debconf information
Reply to: