Update kernel headers and add asm-generic/sockios.h

Update kernel headers to commit
    b970afcfcabd ("Merge tag 'powerpc-5.2-1'")

and import asm-generic/sockios.h to fix the compile errors from the
movement of timestamp macros.

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/asm-generic/sockios.h b/include/uapi/asm-generic/sockios.h
new file mode 100644 (file)
index 0000000..44fa3ed
--- /dev/null
+++ b/include/uapi/asm-generic/sockios.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef __ASM_GENERIC_SOCKIOS_H
+#define __ASM_GENERIC_SOCKIOS_H
+
+/* Socket-level I/O control calls. */
+#define FIOSETOWN      0x8901
+#define SIOCSPGRP      0x8902
+#define FIOGETOWN      0x8903
+#define SIOCGPGRP      0x8904
+#define SIOCATMARK     0x8905
+#define SIOCGSTAMP_OLD 0x8906          /* Get stamp (timeval) */
+#define SIOCGSTAMPNS_OLD 0x8907                /* Get stamp (timespec) */
+
+#endif /* __ASM_GENERIC_SOCKIOS_H */

diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 0c3000faedbae3f831c5e62c4cd0676e1a71ead5..f47e853546faa94bf520b7ce6d76c1edaec800c6 100644 (file)
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -34,14 +34,20 @@
 #define EM_M32R                88      /* Renesas M32R */
 #define EM_MN10300     89      /* Panasonic/MEI MN10300, AM33 */
 #define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
+#define EM_ARCOMPACT   93      /* ARCompact processor */
 #define EM_XTENSA      94      /* Tensilica Xtensa Architecture */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
+#define EM_UNICORE     110     /* UniCore-32 */
 #define EM_ALTERA_NIOS2        113     /* Altera Nios II soft-core processor */
 #define EM_TI_C6000    140     /* TI C6X DSPs */
+#define EM_HEXAGON     164     /* QUALCOMM Hexagon */
+#define EM_NDS32       167     /* Andes Technology compact code size
+                                  embedded RISC processor family */
 #define EM_AARCH64     183     /* ARM 64 bit */
 #define EM_TILEPRO     188     /* Tilera TILEPro */
 #define EM_MICROBLAZE  189     /* Xilinx MicroBlaze */
 #define EM_TILEGX      191     /* Tilera TILE-Gx */
+#define EM_ARCV2       195     /* ARCv2 Cores */
 #define EM_RISCV       243     /* RISC-V */
 #define EM_BPF         247     /* Linux BPF - in-kernel virtual machine */
 #define EM_CSKY                252     /* C-SKY */

diff --git a/include/uapi/linux/sockios.h b/include/uapi/linux/sockios.h
index 35d7a60f9b7a12f68e30e46f0b8ab19bd06f8bd7..7d1bccbbef781f2c0064b568ee22dba135b5b87e 100644 (file)
--- a/include/uapi/linux/sockios.h
+++ b/include/uapi/linux/sockios.h
@@ -39,12 +39,8 @@
 
 #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
 /* on 64-bit and x32, avoid the ?: operator */
-#ifndef SIOCGSTAMP
 #define SIOCGSTAMP     SIOCGSTAMP_OLD
-#endif
-#ifndef SIOCGSTAMPNS
 #define SIOCGSTAMPNS   SIOCGSTAMPNS_OLD
-#endif
 #else
 #define SIOCGSTAMP     ((sizeof(struct timeval))  == 8 ? \
                         SIOCGSTAMP_OLD   : SIOCGSTAMP_NEW)