summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2014-01-12 15:52:21 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-12 16:47:31 +0100
commit106553aa4ead528b1bab37fb3cc47004a4451acc (patch)
tree92f78da74a8b0855e1ffb889277306575cf8a50d
parent663b55b9b39fa9c848cca273ca4e12bf29b32c71 (diff)
downloadtalos-obmc-linux-106553aa4ead528b1bab37fb3cc47004a4451acc.tar.gz
talos-obmc-linux-106553aa4ead528b1bab37fb3cc47004a4451acc.zip
um, x86: Fix vDSO build
Commit 663b55b9b39 ("x86: Delete non-required instances of include <linux/init.h>") broke the UML build. arch/x86/um/vdso/vdso.S: Assembler messages: arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata' arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit' UML's vDSO needs linux/init.h. Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Richard Weinberger <richard@nod.at> Cc: user-mode-linux-devel@lists.sourceforge.net Cc: paul.gortmaker@windriver.com Link: http://lkml.kernel.org/r/1389538341-31383-1-git-send-email-richard@nod.at Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/um/vdso/vdso.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 4b4bd4cc06ab..1cb468adacbb 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,3 +1,4 @@
+#include <linux/init.h>
__INITDATA
OpenPOWER on IntegriCloud