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

This reverts commit 01f34a3bd8c087ca4be0bd24857e454c8d29f20b.

The issue has been fixed in the kernel.

diff --git a/ChangeLog b/ChangeLog
index d93d0a3..2f2c9fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1211,14 +1211,6 @@
        * conform/data/stdbool.h-data: Likewise.
        * conform/data/stdnoreturn.h-data: Likewise.
 
-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-11-07  Roland McGrath  <roland@hack.frob.com>
 
        [BZ #14815]

diff --git a/NEWS b/NEWS
index 1d4a979..196ae30 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,9 +20,8 @@ Version 2.17
   14557, 14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610,
   14621, 14638, 14645, 14648, 14652, 14660, 14661, 14669, 14672, 14683,
   14694, 14716, 14719, 14743, 14767, 14783, 14784, 14785, 14793, 14796,
-  14797, 14801, 14805, 14807, 14809, 14811, 14815, 14821, 14822, 14824,
-  14828, 14831, 14835, 14838, 14856, 14863, 14865, 14866, 14868, 14869,
-  14871.
+  14797, 14801, 14805, 14807, 14811, 14815, 14821, 14822, 14824, 14828,
+  14831, 14835, 14838, 14856, 14863, 14865, 14866, 14868, 14869, 14871.
 
 * Port to ARM AArch64 contributed by Linaro.
 

diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 8b58905..cfa71ad 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>