releases/4.8.10/revert-include-uapi-linux-atm_zatm.h-include-linux-time.h.patch

   1 From foo@baz Fri Nov 18 11:35:46 CET 2016
   2 From: Mike Frysinger <vapier@gentoo.org>
   3 Date: Thu, 10 Nov 2016 19:08:39 -0500
   4 Subject: Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
   5
   6 From: Mike Frysinger <vapier@gentoo.org>
   7
   8
   9 [ Upstream commit 7b5b74efcca00f15c2aec1dc7175bfe34b6ec643 ]
  10
  11 This reverts commit cf00713a655d ("include/uapi/linux/atm_zatm.h: include
  12 linux/time.h").
  13
  14 This attempted to fix userspace breakage that no longer existed when
  15 the patch was merged.  Almost one year earlier, commit 70ba07b675b5
  16 ("atm: remove 'struct zatm_t_hist'") deleted the struct in question.
  17
  18 After this patch was merged, we now have to deal with people being
  19 unable to include this header in conjunction with standard C library
  20 headers like stdlib.h (which linux-atm does).  Example breakage:
  21 x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I./../q2931 -I./../saal \
  22         -I.  -DCPPFLAGS_TEST  -I../../src/include -O2 -march=native -pipe -g \
  23         -frecord-gcc-switches -freport-bug -Wimplicit-function-declaration \
  24         -Wnonnull -Wstrict-aliasing -Wparentheses -Warray-bounds \
  25         -Wfree-nonheap-object -Wreturn-local-addr -fno-strict-aliasing -Wall \
  26         -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c zntune.c
  27 In file included from /usr/include/linux/atm_zatm.h:17:0,
  28                  from zntune.c:17:
  29 /usr/include/linux/time.h:9:8: error: redefinition of ‘struct timespec’
  30  struct timespec {
  31         ^
  32 In file included from /usr/include/sys/select.h:43:0,
  33                  from /usr/include/sys/types.h:219,
  34                  from /usr/include/stdlib.h:314,
  35                  from zntune.c:9:
  36 /usr/include/time.h:120:8: note: originally defined here
  37  struct timespec
  38         ^
  39
  40 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  41 Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
  42 Signed-off-by: David S. Miller <davem@davemloft.net>
  43 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  44 ---
  45  include/uapi/linux/atm_zatm.h |    1 -
  46  1 file changed, 1 deletion(-)
  47
  48 --- a/include/uapi/linux/atm_zatm.h
  49 +++ b/include/uapi/linux/atm_zatm.h
  50 @@ -14,7 +14,6 @@
  51
  52  #include <linux/atmapi.h>
  53  #include <linux/atmioc.h>
  54 -#include <linux/time.h>
  55
  56  #define ZATM_GETPOOL   _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
  57                                                 /* get pool statistics */