Remove stray sys_swapon() declaration

* linux/syscall.h: Remove stray sys_swapon() declaration.
* linux/mips/syscallent.h: Include dummy.h with correct relative path.
* linux/dummy.h: Tweak one place where spaces are used instead of tabs.
* linux/dummy_check.sh: New script. It helps in finding stray syscall
handler declarations.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/linux/dummy.h b/linux/dummy.h
index 26afbbc38dd3b30ebb0c0bd797e71fa8540c69ca..1605bb40bb0da0f50741a7114b5e89f99399fd5f 100644 (file)
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -89,7 +89,7 @@
 #define        sys_pivotroot           sys_link
 #define        sys_rename              sys_link
 #define        sys_rmdir               sys_chdir
-#define        sys_sched_get_priority_max sys_sched_get_priority_min
+#define        sys_sched_get_priority_max      sys_sched_get_priority_min
 #define        sys_swapoff             sys_chdir
 #define        sys_swapon              sys_chdir
 #define        sys_symlink             sys_link

diff --git a/linux/dummy_check.sh b/linux/dummy_check.sh
new file mode 100755 (executable)
index 0000000..bcce34c
--- /dev/null
+++ b/linux/dummy_check.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+grep '^#define' dummy.h | cut -f2 | \
+while read func; do
+       grep -q -F -- "${func}(" syscall.h && echo "Defined as macro and as func: $func"
+done

diff --git a/linux/mips/syscallent.h b/linux/mips/syscallent.h
index 27ca64a4f5b293cb3a9625fab7034f6557372a82..5f404d5a0c600474d6e31bef1e9311fe8f6dd600 100644 (file)
--- a/linux/mips/syscallent.h
+++ b/linux/mips/syscallent.h
@@ -1,4 +1,4 @@
-#include "dummy.h"
+#include "../dummy.h"
 
        { 0,    0,      printargs,              "svr4_syscall"  }, /*  000 */
        { 0,    0,      printargs,              "svr4_exit"     }, /*  001 */

diff --git a/linux/syscall.h b/linux/syscall.h
index 4eb7368b1ce0f8a9a8a7736a05e88131e079f017..45f00a3bad245d8ffeca31632461228a823aefbb 100644 (file)
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -259,7 +259,6 @@ int sys_stat64();
 int sys_statfs();
 int sys_statfs64();
 int sys_stime();
-int sys_swapon();
 int sys_symlinkat();
 int sys_sysctl();
 int sys_sysinfo();