Messages in this thread Patch in this message | | | Date | Sun, 12 Jan 2014 09:45:28 -0800 | From | tip-bot for Richard Weinberger <> | Subject | [tip:x86/cleanups] um, x86: Fix vDSO build |
| |
Commit-ID: 106553aa4ead528b1bab37fb3cc47004a4451acc Gitweb: http://git.kernel.org/tip/106553aa4ead528b1bab37fb3cc47004a4451acc Author: Richard Weinberger <richard@nod.at> AuthorDate: Sun, 12 Jan 2014 15:52:21 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Sun, 12 Jan 2014 16:47:31 +0100
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> --- arch/x86/um/vdso/vdso.S | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S index 4b4bd4c..1cb468a 100644 --- a/arch/x86/um/vdso/vdso.S +++ b/arch/x86/um/vdso/vdso.S @@ -1,3 +1,4 @@ +#include <linux/init.h> __INITDATA
| |