Revert "2012-11-07 Andreas Jaeger <aj@suse.de>"

This reverts commit 68b6636fdc3d5b940d9be060e1f429b6eaa93709.

The issue has been fixed in the kernel.

diff --git a/ChangeLog b/ChangeLog
index 133ee1b97f6d70d4273c74ea8526a45b26b01229..3de21fd1270e8d7ee97506f9acd8ba09a1fac7ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,14 +16,6 @@
        defined and ELF_MACHINE_RUNTIME_FIXUP_ARGS is defined.
        * elf/tst-audit8.c: New file.
 
-2012-11-07  Andreas Jaeger  <aj@suse.de>
-
-       [BZ #14809]
-       * sysdeps/unix/sysv/linux/sys/sysctl.h (_UAPI_LINUX_KERNEL_H)
-       (_UAPI_LINUX_TYPES_H): Starting with Linux 3.7, the include header
-       guards are changed.  Only define if not yet defined, #undef back
-       after including linux/sysctl.h if defined here.
-
 2012-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14648]

diff --git a/NEWS b/NEWS
index 7473dc389cb39b0b617f559968d5d703ea44d1d9..d898de69972100a923554a9e890fe953dc04f629 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16.1
 
 * The following bugs are resolved with this release:
 
-  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14809, 14831
+  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831
 
 Version 2.16
 

diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 8b58905e773f78e698bc83001489392b60497598..cfa71ad27b61d87eadf450d787a07ee67932a24d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/sysctl.h
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -39,14 +39,6 @@
 # define __user
 # define __undef__LINUX_COMPILER_H
 #endif
-#ifndef  _UAPI_LINUX_KERNEL_H
-# define _UAPI_LINUX_KERNEL_H
-# define __undef_UAPI_LINUX_KERNEL_H
-#endif
-#ifndef _UAPI_LINUX_TYPES_H
-# define _UAPI_LINUX_TYPES_H
-# define __undef_UAPI_LINUX_TYPES_H
-#endif
 
 #include <linux/sysctl.h>
 
@@ -67,14 +59,6 @@
 # undef __user
 # undef __undef__LINUX_COMPILER_H
 #endif
-#ifdef  __undef_UAPI_LINUX_KERNEL_H
-# undef _UAPI_LINUX_KERNEL_H
-# undef __undef_UAPI_LINUX_KERNEL_H
-#endif
-#ifdef __undef_UAPI_LINUX_TYPES_H
-# undef _UAPI_LINUX_TYPES_H
-# undef __undef_UAPI_LINUX_TYPES_H
-#endif
 
 #include <bits/sysctl.h>