From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751292AbaALRKp (ORCPT ); Sun, 12 Jan 2014 12:10:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:44457 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbaALRKm (ORCPT ); Sun, 12 Jan 2014 12:10:42 -0500 Date: Sun, 12 Jan 2014 09:10:26 -0800 From: tip-bot for Richard Weinberger Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, richard@nod.at, tglx@linutronix.de Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, richard@nod.at, tglx@linutronix.de In-Reply-To: <1389538341-31383-1-git-send-email-richard@nod.at> References: <1389538341-31383-1-git-send-email-richard@nod.at> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] um, x86: Fix vDSO build Git-Commit-ID: 4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.1 (terminus.zytor.com [127.0.0.1]); Sun, 12 Jan 2014 09:10:33 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5 Gitweb: http://git.kernel.org/tip/4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5 Author: Richard Weinberger AuthorDate: Sun, 12 Jan 2014 15:52:21 +0100 Committer: H. Peter Anvin CommitDate: Sun, 12 Jan 2014 09:06:03 -0800 um, x86: Fix vDSO build Commit 663b55b9b39fa x86: Delete non-required instances of include 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 Link: http://lkml.kernel.org/r/1389538341-31383-1-git-send-email-richard@nod.at Signed-off-by: H. Peter Anvin --- 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 __INITDATA