From 377cc031f5eb1437b55bb60f48a2b013eba9110c Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Fri, 18 Nov 2011 16:03:27 -0800
Subject: [PATCH] --- yaml --- r: 285912 b: refs/heads/master c:
 f14525f9e033f344996905744f41680ea2b877ce h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/syscalls/syscallhdr.sh | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a21dec3a2720..5d1971a53789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 303395ac3bf3e2cb488435537d416bc840438fcb
+refs/heads/master: f14525f9e033f344996905744f41680ea2b877ce
diff --git a/trunk/arch/x86/syscalls/syscallhdr.sh b/trunk/arch/x86/syscalls/syscallhdr.sh
index 0d473ff12eaf..b3c593072785 100644
--- a/trunk/arch/x86/syscalls/syscallhdr.sh
+++ b/trunk/arch/x86/syscalls/syscallhdr.sh
@@ -2,33 +2,20 @@
 
 in="$1"
 out="$2"
-my_abis=`echo "$3" | tr ',' ' '`
+my_abis=`echo "($3)" | tr ',' '|'`
 prefix="$4"
 offset="$5"
 
 fileguard=_ASM_X86_`basename "$out" | sed \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
     -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`
-
-in_list () {
-    local x
-    for x in $1; do
-	if [ x"$x" = x"$2" ]; then
-	    return 0
-	fi
-    done
-    return 1
-}
-
-grep '^[0-9]' "$in" | sort -n | (
+grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (
     echo "#ifndef ${fileguard}"
     echo "#define ${fileguard} 1"
     echo ""
 
     while read nr abi name entry ; do
-	if in_list "$my_abis" "$abi"; then
-	    echo "#define __NR_${prefix}${name}" $((nr+offset))
-        fi
+	echo "#define __NR_${prefix}${name}" $((nr+offset))
     done
 
     echo ""