x86/syscalls: Split the x32 syscalls into their own table

[sfrench/cifs-2.6.git] / arch / x86 / entry / syscalls / syscalltbl.sh

diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index 94fcd1951acaae51a3391d061e429f866469baae..1af2be39e7d9e018ce00166f9b090a2f4de923bc 100644 (file)
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -1,13 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
 in="$1"
 out="$2"
 
 syscall_macro() {
-    abi="$1"
-    nr="$2"
-    entry="$3"
+    local abi="$1"
+    local nr="$2"
+    local entry="$3"
 
     # Entry can be either just a function name or "function/qualifier"
     real_entry="${entry%%/*}"
@@ -21,14 +21,14 @@ syscall_macro() {
 }
 
 emit() {
-    abi="$1"
-    nr="$2"
-    entry="$3"
-    compat="$4"
-    umlentry=""
+    local abi="$1"
+    local nr="$2"
+    local entry="$3"
+    local compat="$4"
+    local umlentry=""
 
-    if [ "$abi" = "64" -a -n "$compat" ]; then
-       echo "a compat entry for a 64-bit syscall makes no sense" >&2
+    if [ "$abi" != "I386" -a -n "$compat" ]; then
+       echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2
        exit 1
     fi
 
@@ -62,14 +62,17 @@ grep '^[0-9]' "$in" | sort -n | (
     while read nr abi name entry compat; do
        abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`
        if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
-           # COMMON is the same as 64, except that we don't expect X32
-           # programs to use it.  Our expectation has nothing to do with
-           # any generated code, so treat them the same.
            emit 64 "$nr" "$entry" "$compat"
+           if [ "$abi" = "COMMON" ]; then
+               # COMMON means that this syscall exists in the same form for
+               # 64-bit and X32.
+               echo "#ifdef CONFIG_X86_X32_ABI"
+               emit X32 "$nr" "$entry" "$compat"
+               echo "#endif"
+           fi
        elif [ "$abi" = "X32" ]; then
-           # X32 is equivalent to 64 on an X32-compatible kernel.
            echo "#ifdef CONFIG_X86_X32_ABI"
-           emit 64 "$nr" "$entry" "$compat"
+           emit X32 "$nr" "$entry" "$compat"
            echo "#endif"
        elif [ "$abi" = "I386" ]; then
            emit "$abi" "$nr" "$entry" "$compat"