Get rid of the "ioctl-mmap" weird-hack flag.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4800 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index eb23a6b..331e8bd 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -854,7 +854,7 @@
"\n"
" uncommon user options for all Valgrind tools:\n"
" --run-libc-freeres=no|yes free up glibc memory at exit? [yes]\n"
-" --weird-hacks=hack1,hack2,... known hacks: lax-ioctls,ioctl-mmap\n"
+" --weird-hacks=hack1,hack2,... known hacks: lax-ioctls\n"
" enable-outer [none]\n"
" --pointercheck=no|yes enforce client address space limits [yes]\n"
" --show-emwarns=no|yes show warnings about emulation limits? [no]\n"
diff --git a/docs/valgrind.1 b/docs/valgrind.1
index d058fd0..f303b48 100644
--- a/docs/valgrind.1
+++ b/docs/valgrind.1
@@ -537,9 +537,9 @@
and assume that unknown ioctls just behave correctly.
.TP
.B
-- ioctl-mmap
-Tell \fBvalgrind\fP to search for new memory mappings after an unknown
-\fBioctl\fP call.
+- enable-inner
+Enable some special magic needed when the program being run is
+itself \fBvalgrind\fP.
.RE
.SH CORE DEBUGGING OPTIONS
diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index f7c60e0..68b7b44 100644
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -1024,17 +1024,13 @@
some device drivers with a large number of strange ioctl
commands becomes very tiresome.</para>
</listitem>
- <listitem><para><computeroutput>ioctl-mmap</computeroutput></para>
- <para>Some ioctl requests can mmap new memory into your
- process address space. If Valgrind doesn't know about these mappings,
- it could put new mappings over them, and/or complain bitterly when
- your program uses them. This option makes Valgrind scan the address
- space for new mappings after each unknown ioctl has finished. You may
- also need to run with
- <computeroutput>--pointercheck=no</computeroutput> if the ioctl
- decides to place the mapping out of the client's usual address space.
+
+ <listitem><para><computeroutput>enable-inner</computeroutput></para>
+ <para>Enable some special magic needed when the program being
+ run is itself Valgrind.
</para>
</listitem>
+
</itemizedlist>
</listitem>
diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index fada224..939c093 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -18,7 +18,7 @@
uncommon user options for all Valgrind tools:
--run-libc-freeres=no|yes free up glibc memory at exit? [yes]
- --weird-hacks=hack1,hack2,... known hacks: lax-ioctls,ioctl-mmap
+ --weird-hacks=hack1,hack2,... known hacks: lax-ioctls
enable-outer [none]
--pointercheck=no|yes enforce client address space limits [yes]
--show-emwarns=no|yes show warnings about emulation limits? [no]
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index ca94f08..a14ca31 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -18,7 +18,7 @@
uncommon user options for all Valgrind tools:
--run-libc-freeres=no|yes free up glibc memory at exit? [yes]
- --weird-hacks=hack1,hack2,... known hacks: lax-ioctls,ioctl-mmap
+ --weird-hacks=hack1,hack2,... known hacks: lax-ioctls
enable-outer [none]
--pointercheck=no|yes enforce client address space limits [yes]
--show-emwarns=no|yes show warnings about emulation limits? [no]