Message ID | 20110728155206.16618.8462.stgit@warthog.procyon.org.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 908b969..e02512f 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h @@ -45,6 +45,8 @@ #define E820_NVS 4 #define E820_UNUSABLE 5 +// DISINTEGRATE: INCLUDE UAPI HERE + /* * reserved RAM used by kernel itself * if CONFIG_INTEL_TXT is enabled, memory of this type will be
There's an ordering problem around the definition of E820_X_MAX: the definition in the kernel-specific header is referred to in the user-specific header data structures, at least for x86. When compiling userspace, the user-specific header provides an alternate version of E820_X_MAX. To get around this problem, place a marker specifically to indicate the point at which the UAPI header should be included in the kernel-specific file. The marker will be deleted later. Signed-off-by: David Howells <dhowells@redhat.com> --- arch/x86/include/asm/e820.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html