Update to v5.5 kernel headers.
Kernel headers coming from:
Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-5.5
Test: Boots on walleye.
Test: Ran bionic-unit-tests on walleye.
Test: Boots on cuttlefish.
Test: Ran bionic-unit-tests on cuttlefish.
Change-Id: I57387d3c31e0ba5ad125ffe291cecf365c7b374e
diff --git a/libc/kernel/uapi/asm-x86/asm/bootparam.h b/libc/kernel/uapi/asm-x86/asm/bootparam.h
index af66fdb..7401135 100644
--- a/libc/kernel/uapi/asm-x86/asm/bootparam.h
+++ b/libc/kernel/uapi/asm-x86/asm/bootparam.h
@@ -25,6 +25,8 @@
#define SETUP_EFI 4
#define SETUP_APPLE_PROPERTIES 5
#define SETUP_JAILHOUSE 6
+#define SETUP_INDIRECT (1 << 31)
+#define SETUP_TYPE_MAX (SETUP_INDIRECT | SETUP_JAILHOUSE)
#define RAMDISK_IMAGE_START_MASK 0x07FF
#define RAMDISK_PROMPT_FLAG 0x8000
#define RAMDISK_LOAD_FLAG 0x4000
@@ -53,6 +55,12 @@
__u32 len;
__u8 data[0];
};
+struct setup_indirect {
+ __u32 type;
+ __u32 reserved;
+ __u64 len;
+ __u64 addr;
+};
struct setup_header {
__u8 setup_sects;
__u16 root_flags;
@@ -92,6 +100,7 @@
__u64 pref_address;
__u32 init_size;
__u32 handover_offset;
+ __u32 kernel_info_offset;
} __attribute__((packed));
struct sys_desc_table {
__u16 length;
@@ -121,15 +130,22 @@
} __attribute__((packed));
#define JAILHOUSE_SETUP_REQUIRED_VERSION 1
struct jailhouse_setup_data {
- __u16 version;
- __u16 compatible_version;
- __u16 pm_timer_address;
- __u16 num_cpus;
- __u64 pci_mmconfig_base;
- __u32 tsc_khz;
- __u32 apic_khz;
- __u8 standard_ioapic;
- __u8 cpu_ids[255];
+ struct {
+ __u16 version;
+ __u16 compatible_version;
+ } __attribute__((packed)) hdr;
+ struct {
+ __u16 pm_timer_address;
+ __u16 num_cpus;
+ __u64 pci_mmconfig_base;
+ __u32 tsc_khz;
+ __u32 apic_khz;
+ __u8 standard_ioapic;
+ __u8 cpu_ids[255];
+ } __attribute__((packed)) v1;
+ struct {
+ __u32 flags;
+ } __attribute__((packed)) v2;
} __attribute__((packed));
struct boot_params {
struct screen_info screen_info;
diff --git a/libc/kernel/uapi/asm-x86/asm/msgbuf.h b/libc/kernel/uapi/asm-x86/asm/msgbuf.h
index 92ab491..b100b20 100644
--- a/libc/kernel/uapi/asm-x86/asm/msgbuf.h
+++ b/libc/kernel/uapi/asm-x86/asm/msgbuf.h
@@ -21,11 +21,12 @@
#if !defined(__x86_64__) || !defined(__ILP32__)
#include <asm-generic/msgbuf.h>
#else
+#include <asm/ipcbuf.h>
struct msqid64_ds {
struct ipc64_perm msg_perm;
- __kernel_time_t msg_stime;
- __kernel_time_t msg_rtime;
- __kernel_time_t msg_ctime;
+ __kernel_long_t msg_stime;
+ __kernel_long_t msg_rtime;
+ __kernel_long_t msg_ctime;
__kernel_ulong_t msg_cbytes;
__kernel_ulong_t msg_qnum;
__kernel_ulong_t msg_qbytes;
diff --git a/libc/kernel/uapi/asm-x86/asm/sembuf.h b/libc/kernel/uapi/asm-x86/asm/sembuf.h
index 9b96722..c633425 100644
--- a/libc/kernel/uapi/asm-x86/asm/sembuf.h
+++ b/libc/kernel/uapi/asm-x86/asm/sembuf.h
@@ -18,6 +18,7 @@
****************************************************************************/
#ifndef _ASM_X86_SEMBUF_H
#define _ASM_X86_SEMBUF_H
+#include <asm/ipcbuf.h>
struct semid64_ds {
struct ipc64_perm sem_perm;
#ifdef __i386__
@@ -26,9 +27,9 @@
unsigned long sem_ctime;
unsigned long sem_ctime_high;
#else
- __kernel_time_t sem_otime;
+ __kernel_long_t sem_otime;
__kernel_ulong_t __unused1;
- __kernel_time_t sem_ctime;
+ __kernel_long_t sem_ctime;
__kernel_ulong_t __unused2;
#endif
__kernel_ulong_t sem_nsems;
diff --git a/libc/kernel/uapi/asm-x86/asm/shmbuf.h b/libc/kernel/uapi/asm-x86/asm/shmbuf.h
index 4486c7b..03e195e 100644
--- a/libc/kernel/uapi/asm-x86/asm/shmbuf.h
+++ b/libc/kernel/uapi/asm-x86/asm/shmbuf.h
@@ -24,9 +24,9 @@
struct shmid64_ds {
struct ipc64_perm shm_perm;
size_t shm_segsz;
- __kernel_time_t shm_atime;
- __kernel_time_t shm_dtime;
- __kernel_time_t shm_ctime;
+ __kernel_long_t shm_atime;
+ __kernel_long_t shm_dtime;
+ __kernel_long_t shm_ctime;
__kernel_pid_t shm_cpid;
__kernel_pid_t shm_lpid;
__kernel_ulong_t shm_nattch;