From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065AbbJNPbE (ORCPT ); Wed, 14 Oct 2015 11:31:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60928 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753729AbbJNPbB (ORCPT ); Wed, 14 Oct 2015 11:31:01 -0400 Date: Wed, 14 Oct 2015 08:30:02 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: torvalds@linux-foundation.org, dvlasenk@redhat.com, bp@alien8.de, luto@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, richard@nod.at Reply-To: torvalds@linux-foundation.org, luto@kernel.org, dvlasenk@redhat.com, bp@alien8.de, peterz@infradead.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, richard@nod.at In-Reply-To: <8d15b9a88f4fd49e3342757e0a34624ee5ce9220.1444696194.git.luto@kernel.org> References: <8d15b9a88f4fd49e3342757e0a34624ee5ce9220.1444696194.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] um/x86: Fix build after x86 syscall changes Git-Commit-ID: 612bece654ff6cd43160e201985be826e96b8bcb 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 612bece654ff6cd43160e201985be826e96b8bcb Gitweb: http://git.kernel.org/tip/612bece654ff6cd43160e201985be826e96b8bcb Author: Andy Lutomirski AuthorDate: Mon, 12 Oct 2015 17:32:14 -0700 Committer: Ingo Molnar CommitDate: Wed, 14 Oct 2015 16:56:28 +0200 um/x86: Fix build after x86 syscall changes I didn't realize that um didn't include x86's asm/syscall.h. Re-add a missing typedef. Reported-by: Richard Weinberger Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 034042cc1e28 ("x86/entry/syscalls: Move syscall table declarations into asm/syscalls.h") Link: http://lkml.kernel.org/r/8d15b9a88f4fd49e3342757e0a34624ee5ce9220.1444696194.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/um/asm/syscall.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/um/asm/syscall.h b/arch/x86/um/asm/syscall.h index 9fe77b7..81d6562 100644 --- a/arch/x86/um/asm/syscall.h +++ b/arch/x86/um/asm/syscall.h @@ -3,6 +3,10 @@ #include +typedef asmlinkage long (*sys_call_ptr_t)(unsigned long, unsigned long, + unsigned long, unsigned long, + unsigned long, unsigned long); + static inline int syscall_get_arch(void) { #ifdef CONFIG_X86_32