[PATCH] x86, asm-offsets: Guard against building the 32/64-bit versions directly

From: Borislav Petkov
Date: Tue Dec 09 2014 - 10:45:25 EST

From: Borislav Petkov <bp@xxxxxxx>

Sometimes it is helpful to build a kernel compilation unit directly, i.e.

make .../<filename>.i

in order to look at compiler output.

Since asm-offsets_{32,64}.c are included by asm-offsets.c and building
them directly doesn't evaluate the macros used (thus making the
preprocessor output not very useful), error out when an attempt is made
to build them. Issue a hint for the user to build asm-offsets.c instead.

Suggested-by: Michael Matz <matz@xxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
arch/x86/kernel/asm-offsets_32.c | 4 ++++
arch/x86/kernel/asm-offsets_64.c | 4 ++++
2 files changed, 8 insertions(+)

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index d67c4be3e8b1..207c48278dff 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -1,3 +1,7 @@
+#ifndef __LINUX_KBUILD_H
+#error "Please do not build this file directly, build asm-offsets.c instead"
#include <asm/ucontext.h>

#include <linux/lguest.h>
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 4f9359f36bb7..7fcb2312b532 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -1,3 +1,7 @@
+#ifndef __LINUX_KBUILD_H
+#error "Please do not build this file directly, build asm-offsets.c instead"
#include <asm/ia32.h>

#define __SYSCALL_64(nr, sym, compat) [nr] = 1,

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/