diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c5f0a6bafe..ea28d648a3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-21  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/i386/tm-linux.h (sys_quotactl): Do not define.
+	* configure.ac (sys_quotactl, START_INFERIOR_TRAPS_EXPECTED): Do not
+	define for i[[3456]]86-*-linux* native configurations.
+	* config.in, configure: Regenerate.
+
 2007-05-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* rs6000-nat.c (xcoff_relocate_symtab): Do nothing if debugging
diff --git a/gdb/config.in b/gdb/config.in
index e8f979ce56..1ca8e46f99 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -551,9 +551,6 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define on a GNU/Linux system to work around problems in sys/procfs.h. */
-#undef START_INFERIOR_TRAPS_EXPECTED
-
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
@@ -615,8 +612,5 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define on a GNU/Linux system to work around problems in sys/procfs.h. */
-#undef sys_quotactl
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
index d662c956a6..128c8258f9 100644
--- a/gdb/config/i386/tm-linux.h
+++ b/gdb/config/i386/tm-linux.h
@@ -23,9 +23,6 @@
 #ifndef TM_LINUX_H
 #define TM_LINUX_H
 
-/* The following works around a problem with /usr/include/sys/procfs.h  */
-#define sys_quotactl 1
-
 /* N_FUN symbols in shared libaries have 0 for their values and need
    to be relocated. */
 #define SOFUN_ADDRESS_MAYBE_MISSING
diff --git a/gdb/configure b/gdb/configure
index fa0d2c3b69..9d9309ea16 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -19277,24 +19277,10 @@ _ACEOF
 
 fi
 
-# If we are configured native on GNU/Linux, work around problems with
-# sys/procfs.h
-# Also detect which type of /proc is in use, such as for Unixware or Solaris.
+# Detect which type of /proc is in use, such as for Unixware or Solaris.
 
 if test "${target}" = "${host}"; then
   case "${host}" in
-  i[3456]86-*-linux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define START_INFERIOR_TRAPS_EXPECTED 2
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define sys_quotactl 1
-_ACEOF
-
-	;;
   *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 3a579fda72..ea16099066 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -686,18 +686,10 @@ if test $gdb_cv_have_pt_getxmmregs = yes; then
   [Define if sys/ptrace.h defines the PT_GETXMMREGS request.])
 fi
 
-# If we are configured native on GNU/Linux, work around problems with
-# sys/procfs.h
-# Also detect which type of /proc is in use, such as for Unixware or Solaris.
+# Detect which type of /proc is in use, such as for Unixware or Solaris.
 
 if test "${target}" = "${host}"; then
   case "${host}" in
-  i[[3456]]86-*-linux*)
-	AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED, 2,
-        [Define on a GNU/Linux system to work around problems in sys/procfs.h.])
-	AC_DEFINE(sys_quotactl, 1,
-        [Define on a GNU/Linux system to work around problems in sys/procfs.h.])
-	;;
   *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )
       AC_DEFINE(NEW_PROC_API, 1,
       [Define if you want to use new multi-fd /proc interface