[tip:x86/cleanups] um, x86: Fix vDSO build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5
Gitweb:     http://git.kernel.org/tip/4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5
Author:     Richard Weinberger <richard@xxxxxx>
AuthorDate: Sun, 12 Jan 2014 15:52:21 +0100
Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Sun, 12 Jan 2014 09:06:03 -0800

um, x86: Fix vDSO build

Commit

    663b55b9b39fa 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.

Signed-off-by: Richard Weinberger <richard@xxxxxx>
Link: http://lkml.kernel.org/r/1389538341-31383-1-git-send-email-richard@xxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
 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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux