uapi: update headers from 4.21-rc1

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>

diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 93722e60204c607377bf20efeca54df08e78bbd4..0c3000faedbae3f831c5e62c4cd0676e1a71ead5 100644 (file)
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -34,6 +34,7 @@
 #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_XTENSA      94      /* Tensilica Xtensa Architecture */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_ALTERA_NIOS2        113     /* Altera Nios II soft-core processor */
 #define EM_TI_C6000    140     /* TI C6X DSPs */
@@ -43,6 +44,7 @@
 #define EM_TILEGX      191     /* Tilera TILE-Gx */
 #define EM_RISCV       243     /* RISC-V */
 #define EM_BPF         247     /* Linux BPF - in-kernel virtual machine */
+#define EM_CSKY                252     /* C-SKY */
 #define EM_FRV         0x5441  /* Fujitsu FR-V */
 
 /*

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 96c24478d8cedb50de46c7b27662f9b81008ce53..f8c00045d537e4b810a768ace70211d0bc0e3686 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -73,6 +73,7 @@
 #define DAXFS_MAGIC             0x64646178
 #define BINFMTFS_MAGIC          0x42494e4d
 #define DEVPTS_SUPER_MAGIC     0x1cd1
+#define BINDERFS_SUPER_MAGIC   0x6c6f6f70
 #define FUTEXFS_SUPER_MAGIC    0xBAD1DEA
 #define PIPEFS_MAGIC            0x50495045
 #define PROC_SUPER_MAGIC       0x9fa0