All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Richard Weinberger <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	richard@nod.at, tglx@linutronix.de
Subject: [tip:x86/cleanups] um, x86: Fix vDSO build
Date: Sun, 12 Jan 2014 09:45:28 -0800	[thread overview]
Message-ID: <tip-106553aa4ead528b1bab37fb3cc47004a4451acc@git.kernel.org> (raw)
In-Reply-To: <1389538341-31383-1-git-send-email-richard@nod.at>

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
 

      parent reply	other threads:[~2014-01-12 17:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-07  0:20 [PATCH] x86: delete non-required instances of include <linux/init.h> Paul Gortmaker
2014-01-07  5:15 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2014-01-07  5:22 ` [PATCH] x86: delete " H. Peter Anvin
2014-01-07 14:26   ` Paul Gortmaker
2014-01-07  5:27 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2014-01-12 12:03   ` Ingo Molnar
2014-01-12 14:22     ` Richard Weinberger
2014-01-12 14:52     ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
2014-01-12 17:02       ` H. Peter Anvin
2014-01-12 17:17         ` Richard Weinberger
2014-01-12 18:58           ` Geert Uytterhoeven
2014-01-12 19:01             ` Richard Weinberger
2014-01-13 12:50         ` Fengguang Wu
2014-01-13 20:01           ` H. Peter Anvin
2014-01-12 17:10       ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
2014-01-12 17:18       ` [uml-devel] [PATCH] " Paul Gortmaker
2014-01-12 17:45       ` tip-bot for Richard Weinberger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-106553aa4ead528b1bab37fb3cc47004a4451acc@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=richard@nod.at \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.