Fix mmap syscall entries

Change syscall names to match kernel __NR_* constants.

* linux/avr32/syscallent.h [90]: Rename "mmap" to "mmap2".
* linux/bfin/syscallent.h [90]: Rename "old_mmap" to "mmap".
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* tests/mmap.c (main): Remove old_mmap from expected output.
* tests/mmap.test: Remove old_mmap from the list of mmap syscalls.

diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h
index 05892e78f10e6ec8f90bd38e70f6b6ca2f264350..bcc60c69d2ed9735b90b629a718ae32f53b87604 100644 (file)
--- a/linux/avr32/syscallent.h
+++ b/linux/avr32/syscallent.h
@@ -115,7 +115,7 @@
 [ 87] = { 5,   TD,             SEN(pwrite),                    "pwrite"                },
 [ 88] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 89] = { 4,   0,              SEN(reboot),                    "reboot"                },
-[ 90] = { 6,   TD|TM|SI,       SEN(mmap_pgoff),                "mmap"                  },
+[ 90] = { 6,   TD|TM|SI,       SEN(mmap_pgoff),                "mmap2"                 },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
index 31bfbd9e832c51a38fd35d3696ee5bf0d987a695..c30e73181a29190740d7b8712065ab63cb2db4d2 100644 (file)
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@@ -116,7 +116,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 6,   TD|TM|SI,       SEN(printargs),                 "old_mmap"              }, /*not implemented in kernel */
+[ 90] = { 6,   TD|TM|SI,       SEN(printargs),                 "mmap"                  }, /*not implemented in kernel */
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index 4a7f52f34a61766b654df62df8545d8a45191063..20ba789f8e10b14934e45f2e08204a0879b8fb24 100644 (file)
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -116,7 +116,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 6,   TD|TM|SI,       SEN(old_mmap),                  "old_mmap"              },
+[ 90] = { 6,   TD|TM|SI,       SEN(old_mmap),                  "mmap"                  },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index ef675acd3663491b6cb029102a5f0bfaf5ac83a7..ead6a3f447192434c2cbb635b56b8e187be378cf 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -116,7 +116,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 1,   TD|TM|SI,       SEN(old_mmap),                  "old_mmap"              },
+[ 90] = { 1,   TD|TM|SI,       SEN(old_mmap),                  "mmap"                  },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
index c7cf2478a60a7c746e80e4905ab8fb156e0f5a39..0336a56393abb3b704dbf8810e5d8856de9e4c19 100644 (file)
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@@ -116,7 +116,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "old_mmap"              },
+[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "mmap"                  },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index 0a63d58b84ec946d9af4e13e9ba1b64f6c03f5f9..9fdae9d0fda746de2794825c21a7a47b1e073574 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -118,7 +118,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "old_mmap"              },
+[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "mmap"                  },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index e2ec231d24e77dc2c1153fa211afc0ec9748143f..a842addfe6f0bb97256e08169bbd7f0ac470bb5c 100644 (file)
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -116,7 +116,7 @@
 [ 87] = { 2,   TF,             SEN(swapon),                    "swapon"                },
 [ 88] = { 4,   0,              SEN(reboot),                    "reboot"                },
 [ 89] = { 3,   TD,             SEN(readdir),                   "readdir"               },
-[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "old_mmap"              },
+[ 90] = { 6,   TD|TM|SI,       SEN(mmap),                      "mmap"                  },
 [ 91] = { 2,   TM|SI,          SEN(munmap),                    "munmap"                },
 [ 92] = { 2,   TF,             SEN(truncate),                  "truncate"              },
 [ 93] = { 2,   TD,             SEN(ftruncate),                 "ftruncate"             },

diff --git a/tests/mmap.c b/tests/mmap.c
index d4d3e664f6dbc35c0d943a969dd0db766149c207..43fcdd8aa0c1f15ed3fc44053577b46ef5e6dcdc 100644 (file)
--- a/tests/mmap.c
+++ b/tests/mmap.c
@@ -33,7 +33,7 @@ main(void)
                return 77;
 
        if (sizeof(offset) == sizeof(int))
-               printf("(mmap2?|old_mmap)\\(%p, %lu, PROT_READ\\|PROT_WRITE, "
+               printf("mmap2?\\(%p, %lu, PROT_READ\\|PROT_WRITE, "
                       "MAP_PRIVATE\\|MAP_ANONYMOUS, %d, %#x\\) = %p\n",
                       addr, length, fd, (unsigned int) offset, p);
        else

diff --git a/tests/mmap.test b/tests/mmap.test
index e9c9b3ab3527dad36e36910638e82ce206e3dc72..e24e7366b0bbfc3614ed4351a0b6e3be5da33885 100755 (executable)
--- a/tests/mmap.test
+++ b/tests/mmap.test
@@ -5,7 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 syscall=mprotect,munmap
-for n in mmap mmap2 old_mmap; do
+for n in mmap mmap2; do
        $STRACE -e$n -h > /dev/null && syscall=$syscall,$n
 done