From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755946AbcA2Lfd (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 Jan 2016 06:35:33 -0500
Received: from terminus.zytor.com ([198.137.202.10]:56460 "EHLO
	terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754977AbcA2Lf3 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 Jan 2016 06:35:29 -0500
Date: Fri, 29 Jan 2016 03:34:23 -0800
From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
Message-ID: <tip-fba324744bfd2a7948a7710d7a021d76dafb9b67@git.kernel.org>
Cc: brgerst@gmail.com, torvalds@linux-foundation.org, mingo@kernel.org,
        tglx@linutronix.de, luto@kernel.org, dvlasenk@redhat.com,
        fweisbec@gmail.com, linux-kernel@vger.kernel.org, luto@amacapital.net,
        peterz@infradead.org, hpa@zytor.com, bp@alien8.de
Reply-To: peterz@infradead.org, hpa@zytor.com, bp@alien8.de,
        linux-kernel@vger.kernel.org, luto@amacapital.net, dvlasenk@redhat.com,
        fweisbec@gmail.com, torvalds@linux-foundation.org, brgerst@gmail.com,
        tglx@linutronix.de, mingo@kernel.org, luto@kernel.org
In-Reply-To: <1bfcbba991f5cfaa9291ff950a593daa972a205f.1454022279.git.luto@kernel.org>
References: <1bfcbba991f5cfaa9291ff950a593daa972a205f.1454022279.git.luto@kernel.org>
To: linux-tip-commits@vger.kernel.org
Subject: [tip:x86/asm] x86/syscalls: Refactor syscalltbl.sh
Git-Commit-ID: fba324744bfd2a7948a7710d7a021d76dafb9b67
X-Mailer: tip-git-log-daemon
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org>
  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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit-ID:  fba324744bfd2a7948a7710d7a021d76dafb9b67
Gitweb:     http://git.kernel.org/tip/fba324744bfd2a7948a7710d7a021d76dafb9b67
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 28 Jan 2016 15:11:21 -0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Jan 2016 09:46:37 +0100

x86/syscalls: Refactor syscalltbl.sh

This splits out the code to emit a syscall line.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1bfcbba991f5cfaa9291ff950a593daa972a205f.1454022279.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/entry/syscalls/syscalltbl.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index 0e7f8ec..167965e 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -3,13 +3,21 @@
 in="$1"
 out="$2"
 
+emit() {
+    abi="$1"
+    nr="$2"
+    entry="$3"
+    compat="$4"
+    if [ -n "$compat" ]; then
+	echo "__SYSCALL_${abi}($nr, $entry, $compat)"
+    elif [ -n "$entry" ]; then
+	echo "__SYSCALL_${abi}($nr, $entry, $entry)"
+    fi
+}
+
 grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
 	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
-	if [ -n "$compat" ]; then
-	    echo "__SYSCALL_${abi}($nr, $entry, $compat)"
-	elif [ -n "$entry" ]; then
-	    echo "__SYSCALL_${abi}($nr, $entry, $entry)"
-	fi
+	emit "$abi" "$nr" "$entry" "$compat"
     done
 ) > "$out"