From bc967efca4b87fb45e946a3ea4cb891883404fd0 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 12 Sep 2019 13:34:05 +0200
Subject: [PATCH] unix: sort Linux-specific includes in linux/types.go and
 mkerrors.sh

Keep the list of includes sorted, so that it's clear where to add new
entries and to avoid duplicates being added.

Change-Id: I67bd8b5a4e4b40affcad636dccfceef2460158b1
Reviewed-on: https://go-review.googlesource.com/c/sys/+/195017
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Matt Layher <mdlayher@gmail.com>
---
 unix/linux/types.go | 77 ++++++++++++++++++++++++---------------------
 unix/mkerrors.sh    | 35 +++++++++++----------
 2 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/unix/linux/types.go b/unix/linux/types.go
index 1b3c7443..d965c130 100644
--- a/unix/linux/types.go
+++ b/unix/linux/types.go
@@ -20,12 +20,17 @@ package unix
 #define _GNU_SOURCE
 
 #include <dirent.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
 #include <poll.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+
 #include <sys/epoll.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
@@ -47,22 +52,7 @@ package unix
 #include <sys/user.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
-#include <linux/bpf.h>
-#include <linux/capability.h>
-#include <linux/errqueue.h>
-#include <linux/fanotify.h>
-#include <linux/filter.h>
-#include <linux/icmpv6.h>
-#include <linux/if_pppox.h>
-#include <linux/keyctl.h>
-#include <linux/loop.h>
-#include <linux/netfilter/nf_tables.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter.h>
-#include <linux/netlink.h>
-#include <linux/perf_event.h>
-#include <linux/rtnetlink.h>
-#include <linux/stat.h>
+
 #if defined(__sparc__)
 // On sparc{,64}, the kernel defines struct termios2 itself which clashes with the
 // definition in glibc. Duplicate the kernel version here.
@@ -86,28 +76,43 @@ struct termios2 {
 #include <asm/termbits.h>
 #endif
 #include <asm/ptrace.h>
-#include <time.h>
-#include <unistd.h>
-#include <utime.h>
-#include <linux/can.h>
-#include <linux/if_alg.h>
-#include <linux/if_packet.h>
-#include <linux/fs.h>
-#include <linux/vm_sockets.h>
-#include <linux/random.h>
-#include <linux/taskstats.h>
-#include <linux/cgroupstats.h>
-#include <linux/genetlink.h>
-#include <linux/socket.h>
-#include <linux/hdreg.h>
-#include <linux/rtc.h>
+
 #include <linux/blkpg.h>
+#include <linux/bpf.h>
+#include <linux/can.h>
+#include <linux/capability.h>
+#include <linux/cgroupstats.h>
+#include <linux/cryptouser.h>
+#include <linux/errqueue.h>
+#include <linux/fanotify.h>
+#include <linux/filter.h>
+#include <linux/fs.h>
+#include <linux/genetlink.h>
+#include <linux/hdreg.h>
+#include <linux/icmpv6.h>
+#include <linux/if_alg.h>
+#include <linux/if_bridge.h>
+#include <linux/if_packet.h>
+#include <linux/if_pppox.h>
+#include <linux/if_xdp.h>
+#include <linux/keyctl.h>
+#include <linux/loop.h>
+#include <linux/ncsi.h>
 #include <linux/net_namespace.h>
 #include <linux/net_tstamp.h>
-#include <linux/if_xdp.h>
-#include <linux/ncsi.h>
-#include <linux/cryptouser.h>
+#include <linux/netfilter/nf_tables.h>
+#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter.h>
+#include <linux/netlink.h>
+#include <linux/perf_event.h>
+#include <linux/random.h>
+#include <linux/rtc.h>
+#include <linux/rtnetlink.h>
+#include <linux/socket.h>
+#include <linux/stat.h>
+#include <linux/taskstats.h>
 #include <linux/tipc.h>
+#include <linux/vm_sockets.h>
 
 // abi/abi.h generated by mkall.go.
 #include "abi/abi.h"
diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh
index e096161a..312a7d33 100755
--- a/unix/mkerrors.sh
+++ b/unix/mkerrors.sh
@@ -183,20 +183,26 @@ struct ltchars {
 #include <sys/socket.h>
 #include <sys/xattr.h>
 #include <linux/bpf.h>
+#include <linux/can.h>
 #include <linux/capability.h>
+#include <linux/cryptouser.h>
 #include <linux/errqueue.h>
+#include <linux/falloc.h>
+#include <linux/fanotify.h>
+#include <linux/filter.h>
+#include <linux/fs.h>
+#include <linux/genetlink.h>
+#include <linux/hdreg.h>
+#include <linux/icmpv6.h>
 #include <linux/if.h>
+#include <linux/if_addr.h>
 #include <linux/if_alg.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/if_ppp.h>
 #include <linux/if_tun.h>
 #include <linux/if_packet.h>
-#include <linux/if_addr.h>
-#include <linux/falloc.h>
-#include <linux/fanotify.h>
-#include <linux/filter.h>
-#include <linux/fs.h>
+#include <linux/if_xdp.h>
 #include <linux/kexec.h>
 #include <linux/keyctl.h>
 #include <linux/loop.h>
@@ -208,26 +214,21 @@ struct ltchars {
 #include <linux/net_namespace.h>
 #include <linux/nsfs.h>
 #include <linux/perf_event.h>
+#include <linux/ptrace.h>
 #include <linux/random.h>
 #include <linux/reboot.h>
+#include <linux/rtc.h>
 #include <linux/rtnetlink.h>
-#include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/seccomp.h>
-#include <linux/sockios.h>
-#include <linux/wait.h>
-#include <linux/icmpv6.h>
 #include <linux/serial.h>
-#include <linux/can.h>
-#include <linux/vm_sockets.h>
+#include <linux/sockios.h>
 #include <linux/taskstats.h>
-#include <linux/genetlink.h>
-#include <linux/watchdog.h>
-#include <linux/hdreg.h>
-#include <linux/rtc.h>
-#include <linux/if_xdp.h>
-#include <linux/cryptouser.h>
 #include <linux/tipc.h>
+#include <linux/vm_sockets.h>
+#include <linux/wait.h>
+#include <linux/watchdog.h>
+
 #include <mtd/ubi-user.h>
 #include <net/route.h>