x86_64: regenerate bootparam bindings without unions

TEST=crosvm run still works
BUG=chromium:761517

Change-Id: I6e95dde573febb5e498107b84b574373d1685c9a
Reviewed-on: https://chromium-review.googlesource.com/1625947
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>

3 files changed, 107 insertions, 3534 deletions

diff --git a/x86_64/src/bootparam.rs b/x86_64/src/bootparam.rs
index 51d6102..33bd90a 100644
--- a/x86_64/src/bootparam.rs
+++ b/x86_64/src/bootparam.rs
@@ -3,18 +3,21 @@
 // found in the LICENSE file.
 
 /*
- * automatically generated by rust-bindgen
- * From upstream linux bootparam.h at commit:
- * 806276b7f07a39a1cc3f38bb1ef5c573d4594a38
+ * automatically generated by bindgen
+ * From chromeos-linux v4.19
+ * $ bindgen \
+ *       --no-layout-tests --with-derive-default --no-doc-comments \
+ *       --whitelist-type boot_params --whitelist-type setup_data \
+ *       arch/x86/include/uapi/asm/bootparam.h
  */
 
 #[repr(C)]
 #[derive(Default)]
-pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>);
+pub struct __IncompleteArrayField<T>(::std::marker::PhantomData<T>, [T; 0]);
 impl<T> __IncompleteArrayField<T> {
     #[inline]
     pub fn new() -> Self {
-        __IncompleteArrayField(::std::marker::PhantomData)
+        __IncompleteArrayField(::std::marker::PhantomData, [])
     }
     #[inline]
     pub unsafe fn as_ptr(&self) -> *const T {
@@ -34,7 +37,7 @@ impl<T> __IncompleteArrayField<T> {
     }
 }
 impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
-    fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         fmt.write_str("__IncompleteArrayField")
     }
 }
@@ -44,319 +47,12 @@ impl<T> ::std::clone::Clone for __IncompleteArrayField<T> {
         Self::new()
     }
 }
-impl<T> ::std::marker::Copy for __IncompleteArrayField<T> {}
-#[repr(C)]
-pub struct __BindgenUnionField<T>(::std::marker::PhantomData<T>);
-impl<T> __BindgenUnionField<T> {
-    #[inline]
-    pub fn new() -> Self {
-        __BindgenUnionField(::std::marker::PhantomData)
-    }
-    #[inline]
-    pub unsafe fn as_ref(&self) -> &T {
-        ::std::mem::transmute(self)
-    }
-    #[inline]
-    pub unsafe fn as_mut(&mut self) -> &mut T {
-        ::std::mem::transmute(self)
-    }
-}
-impl<T> ::std::default::Default for __BindgenUnionField<T> {
-    #[inline]
-    fn default() -> Self {
-        Self::new()
-    }
-}
-impl<T> ::std::clone::Clone for __BindgenUnionField<T> {
-    #[inline]
-    fn clone(&self) -> Self {
-        Self::new()
-    }
-}
-impl<T> ::std::marker::Copy for __BindgenUnionField<T> {}
-impl<T> ::std::fmt::Debug for __BindgenUnionField<T> {
-    fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        fmt.write_str("__BindgenUnionField")
-    }
-}
-pub const SETUP_NONE: ::std::os::raw::c_uint = 0;
-pub const SETUP_E820_EXT: ::std::os::raw::c_uint = 1;
-pub const SETUP_DTB: ::std::os::raw::c_uint = 2;
-pub const SETUP_PCI: ::std::os::raw::c_uint = 3;
-pub const SETUP_EFI: ::std::os::raw::c_uint = 4;
-pub const RAMDISK_IMAGE_START_MASK: ::std::os::raw::c_uint = 2047;
-pub const RAMDISK_PROMPT_FLAG: ::std::os::raw::c_uint = 32768;
-pub const RAMDISK_LOAD_FLAG: ::std::os::raw::c_uint = 16384;
-pub const LOADED_HIGH: ::std::os::raw::c_uint = 1;
-pub const QUIET_FLAG: ::std::os::raw::c_uint = 32;
-pub const KEEP_SEGMENTS: ::std::os::raw::c_uint = 64;
-pub const CAN_USE_HEAP: ::std::os::raw::c_uint = 128;
-pub const XLF_KERNEL_64: ::std::os::raw::c_uint = 1;
-pub const XLF_CAN_BE_LOADED_ABOVE_4G: ::std::os::raw::c_uint = 2;
-pub const XLF_EFI_HANDOVER_32: ::std::os::raw::c_uint = 4;
-pub const XLF_EFI_HANDOVER_64: ::std::os::raw::c_uint = 8;
-pub const XLF_EFI_KEXEC: ::std::os::raw::c_uint = 16;
-pub const __BITS_PER_LONG: ::std::os::raw::c_uint = 64;
-pub const __FD_SETSIZE: ::std::os::raw::c_uint = 1024;
-pub const VIDEO_TYPE_MDA: ::std::os::raw::c_uint = 16;
-pub const VIDEO_TYPE_CGA: ::std::os::raw::c_uint = 17;
-pub const VIDEO_TYPE_EGAM: ::std::os::raw::c_uint = 32;
-pub const VIDEO_TYPE_EGAC: ::std::os::raw::c_uint = 33;
-pub const VIDEO_TYPE_VGAC: ::std::os::raw::c_uint = 34;
-pub const VIDEO_TYPE_VLFB: ::std::os::raw::c_uint = 35;
-pub const VIDEO_TYPE_PICA_S3: ::std::os::raw::c_uint = 48;
-pub const VIDEO_TYPE_MIPS_G364: ::std::os::raw::c_uint = 49;
-pub const VIDEO_TYPE_SGI: ::std::os::raw::c_uint = 51;
-pub const VIDEO_TYPE_TGAC: ::std::os::raw::c_uint = 64;
-pub const VIDEO_TYPE_SUN: ::std::os::raw::c_uint = 80;
-pub const VIDEO_TYPE_SUNPCI: ::std::os::raw::c_uint = 81;
-pub const VIDEO_TYPE_PMAC: ::std::os::raw::c_uint = 96;
-pub const VIDEO_TYPE_EFI: ::std::os::raw::c_uint = 112;
-pub const VIDEO_FLAGS_NOCURSOR: ::std::os::raw::c_uint = 1;
-pub const VIDEO_CAPABILITY_SKIP_QUIRKS: ::std::os::raw::c_uint = 1;
-pub const APM_STATE_READY: ::std::os::raw::c_uint = 0;
-pub const APM_STATE_STANDBY: ::std::os::raw::c_uint = 1;
-pub const APM_STATE_SUSPEND: ::std::os::raw::c_uint = 2;
-pub const APM_STATE_OFF: ::std::os::raw::c_uint = 3;
-pub const APM_STATE_BUSY: ::std::os::raw::c_uint = 4;
-pub const APM_STATE_REJECT: ::std::os::raw::c_uint = 5;
-pub const APM_STATE_OEM_SYS: ::std::os::raw::c_uint = 32;
-pub const APM_STATE_OEM_DEV: ::std::os::raw::c_uint = 64;
-pub const APM_STATE_DISABLE: ::std::os::raw::c_uint = 0;
-pub const APM_STATE_ENABLE: ::std::os::raw::c_uint = 1;
-pub const APM_STATE_DISENGAGE: ::std::os::raw::c_uint = 0;
-pub const APM_STATE_ENGAGE: ::std::os::raw::c_uint = 1;
-pub const APM_SYS_STANDBY: ::std::os::raw::c_uint = 1;
-pub const APM_SYS_SUSPEND: ::std::os::raw::c_uint = 2;
-pub const APM_NORMAL_RESUME: ::std::os::raw::c_uint = 3;
-pub const APM_CRITICAL_RESUME: ::std::os::raw::c_uint = 4;
-pub const APM_LOW_BATTERY: ::std::os::raw::c_uint = 5;
-pub const APM_POWER_STATUS_CHANGE: ::std::os::raw::c_uint = 6;
-pub const APM_UPDATE_TIME: ::std::os::raw::c_uint = 7;
-pub const APM_CRITICAL_SUSPEND: ::std::os::raw::c_uint = 8;
-pub const APM_USER_STANDBY: ::std::os::raw::c_uint = 9;
-pub const APM_USER_SUSPEND: ::std::os::raw::c_uint = 10;
-pub const APM_STANDBY_RESUME: ::std::os::raw::c_uint = 11;
-pub const APM_CAPABILITY_CHANGE: ::std::os::raw::c_uint = 12;
-pub const APM_USER_HIBERNATION: ::std::os::raw::c_uint = 13;
-pub const APM_HIBERNATION_RESUME: ::std::os::raw::c_uint = 14;
-pub const APM_SUCCESS: ::std::os::raw::c_uint = 0;
-pub const APM_DISABLED: ::std::os::raw::c_uint = 1;
-pub const APM_CONNECTED: ::std::os::raw::c_uint = 2;
-pub const APM_NOT_CONNECTED: ::std::os::raw::c_uint = 3;
-pub const APM_16_CONNECTED: ::std::os::raw::c_uint = 5;
-pub const APM_16_UNSUPPORTED: ::std::os::raw::c_uint = 6;
-pub const APM_32_CONNECTED: ::std::os::raw::c_uint = 7;
-pub const APM_32_UNSUPPORTED: ::std::os::raw::c_uint = 8;
-pub const APM_BAD_DEVICE: ::std::os::raw::c_uint = 9;
-pub const APM_BAD_PARAM: ::std::os::raw::c_uint = 10;
-pub const APM_NOT_ENGAGED: ::std::os::raw::c_uint = 11;
-pub const APM_BAD_FUNCTION: ::std::os::raw::c_uint = 12;
-pub const APM_RESUME_DISABLED: ::std::os::raw::c_uint = 13;
-pub const APM_NO_ERROR: ::std::os::raw::c_uint = 83;
-pub const APM_BAD_STATE: ::std::os::raw::c_uint = 96;
-pub const APM_NO_EVENTS: ::std::os::raw::c_uint = 128;
-pub const APM_NOT_PRESENT: ::std::os::raw::c_uint = 134;
-pub const APM_DEVICE_BIOS: ::std::os::raw::c_uint = 0;
-pub const APM_DEVICE_ALL: ::std::os::raw::c_uint = 1;
-pub const APM_DEVICE_DISPLAY: ::std::os::raw::c_uint = 256;
-pub const APM_DEVICE_STORAGE: ::std::os::raw::c_uint = 512;
-pub const APM_DEVICE_PARALLEL: ::std::os::raw::c_uint = 768;
-pub const APM_DEVICE_SERIAL: ::std::os::raw::c_uint = 1024;
-pub const APM_DEVICE_NETWORK: ::std::os::raw::c_uint = 1280;
-pub const APM_DEVICE_PCMCIA: ::std::os::raw::c_uint = 1536;
-pub const APM_DEVICE_BATTERY: ::std::os::raw::c_uint = 32768;
-pub const APM_DEVICE_OEM: ::std::os::raw::c_uint = 57344;
-pub const APM_DEVICE_OLD_ALL: ::std::os::raw::c_uint = 65535;
-pub const APM_DEVICE_CLASS: ::std::os::raw::c_uint = 255;
-pub const APM_DEVICE_MASK: ::std::os::raw::c_uint = 65280;
-pub const APM_MAX_BATTERIES: ::std::os::raw::c_uint = 2;
-pub const APM_CAP_GLOBAL_STANDBY: ::std::os::raw::c_uint = 1;
-pub const APM_CAP_GLOBAL_SUSPEND: ::std::os::raw::c_uint = 2;
-pub const APM_CAP_RESUME_STANDBY_TIMER: ::std::os::raw::c_uint = 4;
-pub const APM_CAP_RESUME_SUSPEND_TIMER: ::std::os::raw::c_uint = 8;
-pub const APM_CAP_RESUME_STANDBY_RING: ::std::os::raw::c_uint = 16;
-pub const APM_CAP_RESUME_SUSPEND_RING: ::std::os::raw::c_uint = 32;
-pub const APM_CAP_RESUME_STANDBY_PCMCIA: ::std::os::raw::c_uint = 64;
-pub const APM_CAP_RESUME_SUSPEND_PCMCIA: ::std::os::raw::c_uint = 128;
-pub const _IOC_NRBITS: ::std::os::raw::c_uint = 8;
-pub const _IOC_TYPEBITS: ::std::os::raw::c_uint = 8;
-pub const _IOC_SIZEBITS: ::std::os::raw::c_uint = 14;
-pub const _IOC_DIRBITS: ::std::os::raw::c_uint = 2;
-pub const _IOC_NRMASK: ::std::os::raw::c_uint = 255;
-pub const _IOC_TYPEMASK: ::std::os::raw::c_uint = 255;
-pub const _IOC_SIZEMASK: ::std::os::raw::c_uint = 16383;
-pub const _IOC_DIRMASK: ::std::os::raw::c_uint = 3;
-pub const _IOC_NRSHIFT: ::std::os::raw::c_uint = 0;
-pub const _IOC_TYPESHIFT: ::std::os::raw::c_uint = 8;
-pub const _IOC_SIZESHIFT: ::std::os::raw::c_uint = 16;
-pub const _IOC_DIRSHIFT: ::std::os::raw::c_uint = 30;
-pub const _IOC_NONE: ::std::os::raw::c_uint = 0;
-pub const _IOC_WRITE: ::std::os::raw::c_uint = 1;
-pub const _IOC_READ: ::std::os::raw::c_uint = 2;
-pub const IOC_IN: ::std::os::raw::c_uint = 1073741824;
-pub const IOC_OUT: ::std::os::raw::c_uint = 2147483648;
-pub const IOC_INOUT: ::std::os::raw::c_uint = 3221225472;
-pub const IOCSIZE_MASK: ::std::os::raw::c_uint = 1073676288;
-pub const IOCSIZE_SHIFT: ::std::os::raw::c_uint = 16;
-pub const EDDNR: ::std::os::raw::c_uint = 489;
-pub const EDDBUF: ::std::os::raw::c_uint = 3328;
-pub const EDDMAXNR: ::std::os::raw::c_uint = 6;
-pub const EDDEXTSIZE: ::std::os::raw::c_uint = 8;
-pub const EDDPARMSIZE: ::std::os::raw::c_uint = 74;
-pub const CHECKEXTENSIONSPRESENT: ::std::os::raw::c_uint = 65;
-pub const GETDEVICEPARAMETERS: ::std::os::raw::c_uint = 72;
-pub const LEGACYGETDEVICEPARAMETERS: ::std::os::raw::c_uint = 8;
-pub const EDDMAGIC1: ::std::os::raw::c_uint = 21930;
-pub const EDDMAGIC2: ::std::os::raw::c_uint = 43605;
-pub const READ_SECTORS: ::std::os::raw::c_uint = 2;
-pub const EDD_MBR_SIG_OFFSET: ::std::os::raw::c_uint = 440;
-pub const EDD_MBR_SIG_BUF: ::std::os::raw::c_uint = 656;
-pub const EDD_MBR_SIG_MAX: ::std::os::raw::c_uint = 16;
-pub const EDD_MBR_SIG_NR_BUF: ::std::os::raw::c_uint = 490;
-pub const EDD_EXT_FIXED_DISK_ACCESS: ::std::os::raw::c_uint = 1;
-pub const EDD_EXT_DEVICE_LOCKING_AND_EJECTING: ::std::os::raw::c_uint = 2;
-pub const EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT: ::std::os::raw::c_uint = 4;
-pub const EDD_EXT_64BIT_EXTENSIONS: ::std::os::raw::c_uint = 8;
-pub const EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT: ::std::os::raw::c_uint = 1;
-pub const EDD_INFO_GEOMETRY_VALID: ::std::os::raw::c_uint = 2;
-pub const EDD_INFO_REMOVABLE: ::std::os::raw::c_uint = 4;
-pub const EDD_INFO_WRITE_VERIFY: ::std::os::raw::c_uint = 8;
-pub const EDD_INFO_MEDIA_CHANGE_NOTIFICATION: ::std::os::raw::c_uint = 16;
-pub const EDD_INFO_LOCKABLE: ::std::os::raw::c_uint = 32;
-pub const EDD_INFO_NO_MEDIA_PRESENT: ::std::os::raw::c_uint = 64;
-pub const EDD_INFO_USE_INT13_FN50: ::std::os::raw::c_uint = 128;
-pub const E820MAP: ::std::os::raw::c_uint = 720;
-pub const E820MAX: ::std::os::raw::c_uint = 128;
-pub const E820_X_MAX: ::std::os::raw::c_uint = 128;
-pub const E820NR: ::std::os::raw::c_uint = 488;
-pub const E820_RAM: ::std::os::raw::c_uint = 1;
-pub const E820_RESERVED: ::std::os::raw::c_uint = 2;
-pub const E820_ACPI: ::std::os::raw::c_uint = 3;
-pub const E820_NVS: ::std::os::raw::c_uint = 4;
-pub const E820_UNUSABLE: ::std::os::raw::c_uint = 5;
-pub const E820_RESERVED_KERN: ::std::os::raw::c_uint = 128;
-pub const ISA_START_ADDRESS: ::std::os::raw::c_uint = 655360;
-pub const ISA_END_ADDRESS: ::std::os::raw::c_uint = 1048576;
-pub const BIOS_BEGIN: ::std::os::raw::c_uint = 655360;
-pub const BIOS_END: ::std::os::raw::c_uint = 1048576;
-pub const BIOS_ROM_BASE: ::std::os::raw::c_uint = 4292870144;
-pub const BIOS_ROM_END: ::std::os::raw::c_uint = 4294967295;
-pub type __s8 = ::std::os::raw::c_schar;
 pub type __u8 = ::std::os::raw::c_uchar;
-pub type __s16 = ::std::os::raw::c_short;
 pub type __u16 = ::std::os::raw::c_ushort;
-pub type __s32 = ::std::os::raw::c_int;
 pub type __u32 = ::std::os::raw::c_uint;
-pub type __s64 = ::std::os::raw::c_longlong;
 pub type __u64 = ::std::os::raw::c_ulonglong;
-#[repr(C)]
-#[derive(Debug, Default, Copy)]
-pub struct __kernel_fd_set {
-    pub fds_bits: [::std::os::raw::c_ulong; 16usize],
-}
-#[test]
-fn bindgen_test_layout___kernel_fd_set() {
-    assert_eq!(
-        ::std::mem::size_of::<__kernel_fd_set>(),
-        128usize,
-        concat!("Size of: ", stringify!(__kernel_fd_set))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<__kernel_fd_set>(),
-        8usize,
-        concat!("Alignment of ", stringify!(__kernel_fd_set))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const __kernel_fd_set)).fds_bits as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(__kernel_fd_set),
-            "::",
-            stringify!(fds_bits)
-        )
-    );
-}
-impl Clone for __kernel_fd_set {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-pub type __kernel_sighandler_t =
-    ::std::option::Option<unsafe extern "C" fn(arg1: ::std::os::raw::c_int)>;
-pub type __kernel_key_t = ::std::os::raw::c_int;
-pub type __kernel_mqd_t = ::std::os::raw::c_int;
-pub type __kernel_old_uid_t = ::std::os::raw::c_ushort;
-pub type __kernel_old_gid_t = ::std::os::raw::c_ushort;
-pub type __kernel_old_dev_t = ::std::os::raw::c_ulong;
-pub type __kernel_long_t = ::std::os::raw::c_long;
-pub type __kernel_ulong_t = ::std::os::raw::c_ulong;
-pub type __kernel_ino_t = __kernel_ulong_t;
-pub type __kernel_mode_t = ::std::os::raw::c_uint;
-pub type __kernel_pid_t = ::std::os::raw::c_int;
-pub type __kernel_ipc_pid_t = ::std::os::raw::c_int;
-pub type __kernel_uid_t = ::std::os::raw::c_uint;
-pub type __kernel_gid_t = ::std::os::raw::c_uint;
-pub type __kernel_suseconds_t = __kernel_long_t;
-pub type __kernel_daddr_t = ::std::os::raw::c_int;
-pub type __kernel_uid32_t = ::std::os::raw::c_uint;
-pub type __kernel_gid32_t = ::std::os::raw::c_uint;
-pub type __kernel_size_t = __kernel_ulong_t;
-pub type __kernel_ssize_t = __kernel_long_t;
-pub type __kernel_ptrdiff_t = __kernel_long_t;
-#[repr(C)]
-#[derive(Debug, Default, Copy)]
-pub struct __kernel_fsid_t {
-    pub val: [::std::os::raw::c_int; 2usize],
-}
-#[test]
-fn bindgen_test_layout___kernel_fsid_t() {
-    assert_eq!(
-        ::std::mem::size_of::<__kernel_fsid_t>(),
-        8usize,
-        concat!("Size of: ", stringify!(__kernel_fsid_t))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<__kernel_fsid_t>(),
-        4usize,
-        concat!("Alignment of ", stringify!(__kernel_fsid_t))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const __kernel_fsid_t)).val as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(__kernel_fsid_t),
-            "::",
-            stringify!(val)
-        )
-    );
-}
-impl Clone for __kernel_fsid_t {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-pub type __kernel_off_t = __kernel_long_t;
-pub type __kernel_loff_t = ::std::os::raw::c_longlong;
-pub type __kernel_time_t = __kernel_long_t;
-pub type __kernel_clock_t = __kernel_long_t;
-pub type __kernel_timer_t = ::std::os::raw::c_int;
-pub type __kernel_clockid_t = ::std::os::raw::c_int;
-pub type __kernel_caddr_t = *mut ::std::os::raw::c_char;
-pub type __kernel_uid16_t = ::std::os::raw::c_ushort;
-pub type __kernel_gid16_t = ::std::os::raw::c_ushort;
-pub type __le16 = __u16;
-pub type __be16 = __u16;
-pub type __le32 = __u32;
-pub type __be32 = __u32;
-pub type __le64 = __u64;
-pub type __be64 = __u64;
-pub type __sum16 = __u16;
-pub type __wsum = __u32;
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct screen_info {
     pub orig_x: __u8,
     pub orig_y: __u8,
@@ -392,380 +88,11 @@ pub struct screen_info {
     pub pages: __u16,
     pub vesa_attributes: __u16,
     pub capabilities: __u32,
-    pub _reserved: [__u8; 6usize],
-}
-#[test]
-fn bindgen_test_layout_screen_info() {
-    assert_eq!(
-        ::std::mem::size_of::<screen_info>(),
-        64usize,
-        concat!("Size of: ", stringify!(screen_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<screen_info>(),
-        1usize,
-        concat!("Alignment of ", stringify!(screen_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_x as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_x)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_y as *const _ as usize },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_y)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).ext_mem_k as *const _ as usize },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(ext_mem_k)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_page as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_page)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_mode as *const _ as usize },
-        6usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_mode)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_cols as *const _ as usize },
-        7usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_cols)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).flags as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(flags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).unused2 as *const _ as usize },
-        9usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(unused2)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_ega_bx as *const _ as usize },
-        10usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_ega_bx)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).unused3 as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(unused3)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_lines as *const _ as usize },
-        14usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_lines)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_isVGA as *const _ as usize },
-        15usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_isVGA)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).orig_video_points as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(orig_video_points)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_width as *const _ as usize },
-        18usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_width)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_height as *const _ as usize },
-        20usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_height)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_depth as *const _ as usize },
-        22usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_depth)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_base as *const _ as usize },
-        24usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_base)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_size as *const _ as usize },
-        28usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).cl_magic as *const _ as usize },
-        32usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(cl_magic)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).cl_offset as *const _ as usize },
-        34usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(cl_offset)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).lfb_linelength as *const _ as usize },
-        36usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(lfb_linelength)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).red_size as *const _ as usize },
-        38usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(red_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).red_pos as *const _ as usize },
-        39usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(red_pos)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).green_size as *const _ as usize },
-        40usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(green_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).green_pos as *const _ as usize },
-        41usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(green_pos)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).blue_size as *const _ as usize },
-        42usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(blue_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).blue_pos as *const _ as usize },
-        43usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(blue_pos)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).rsvd_size as *const _ as usize },
-        44usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(rsvd_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).rsvd_pos as *const _ as usize },
-        45usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(rsvd_pos)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).vesapm_seg as *const _ as usize },
-        46usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(vesapm_seg)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).vesapm_off as *const _ as usize },
-        48usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(vesapm_off)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).pages as *const _ as usize },
-        50usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(pages)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).vesa_attributes as *const _ as usize },
-        52usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(vesa_attributes)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info)).capabilities as *const _ as usize },
-        54usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(capabilities)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const screen_info))._reserved as *const _ as usize },
-        58usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(screen_info),
-            "::",
-            stringify!(_reserved)
-        )
-    );
-}
-impl Clone for screen_info {
-    fn clone(&self) -> Self {
-        *self
-    }
+    pub ext_lfb_base: __u32,
+    pub _reserved: [__u8; 2usize],
 }
-pub type apm_event_t = ::std::os::raw::c_ushort;
-pub type apm_eventinfo_t = ::std::os::raw::c_ushort;
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct apm_bios_info {
     pub version: __u16,
     pub cseg: __u16,
@@ -777,116 +104,8 @@ pub struct apm_bios_info {
     pub cseg_16_len: __u16,
     pub dseg_len: __u16,
 }
-#[test]
-fn bindgen_test_layout_apm_bios_info() {
-    assert_eq!(
-        ::std::mem::size_of::<apm_bios_info>(),
-        20usize,
-        concat!("Size of: ", stringify!(apm_bios_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<apm_bios_info>(),
-        4usize,
-        concat!("Alignment of ", stringify!(apm_bios_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).version as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).cseg as *const _ as usize },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(cseg)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).offset as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(offset)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).cseg_16 as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(cseg_16)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).dseg as *const _ as usize },
-        10usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(dseg)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).flags as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(flags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).cseg_len as *const _ as usize },
-        14usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(cseg_len)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).cseg_16_len as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(cseg_16_len)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const apm_bios_info)).dseg_len as *const _ as usize },
-        18usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(apm_bios_info),
-            "::",
-            stringify!(dseg_len)
-        )
-    );
-}
-impl Clone for apm_bios_info {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Copy, Clone)]
 pub struct edd_device_params {
     pub length: __u16,
     pub info_flags: __u16,
@@ -908,88 +127,25 @@ pub struct edd_device_params {
     pub checksum: __u8,
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
-pub struct edd_device_params__bindgen_ty_1 {
-    pub isa: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_1>,
-    pub pci: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_2>,
-    pub ibnd: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_3>,
-    pub xprs: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_4>,
-    pub htpt: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_5>,
-    pub unknown: __BindgenUnionField<edd_device_params__bindgen_ty_1__bindgen_ty_6>,
-    pub bindgen_union_field: [u8; 8usize],
+#[derive(Copy, Clone)]
+pub union edd_device_params__bindgen_ty_1 {
+    pub isa: edd_device_params__bindgen_ty_1__bindgen_ty_1,
+    pub pci: edd_device_params__bindgen_ty_1__bindgen_ty_2,
+    pub ibnd: edd_device_params__bindgen_ty_1__bindgen_ty_3,
+    pub xprs: edd_device_params__bindgen_ty_1__bindgen_ty_4,
+    pub htpt: edd_device_params__bindgen_ty_1__bindgen_ty_5,
+    pub unknown: edd_device_params__bindgen_ty_1__bindgen_ty_6,
+    _bindgen_union_align: [u8; 8usize],
 }
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_1 {
     pub base_address: __u16,
     pub reserved1: __u16,
     pub reserved2: __u32,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_1() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_1>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_1)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_1>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_1)).base_address as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(base_address)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_1)).reserved1 as *const _
-                as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_1)).reserved2 as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_1),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_1 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_2 {
     pub bus: __u8,
     pub slot: __u8,
@@ -997,357 +153,48 @@ pub struct edd_device_params__bindgen_ty_1__bindgen_ty_2 {
     pub channel: __u8,
     pub reserved: __u32,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_2() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_2>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_2>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_2)).bus as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(bus)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_2)).slot as *const _
-                as usize
-        },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(slot)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_2)).function as *const _
-                as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(function)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_2)).channel as *const _
-                as usize
-        },
-        3usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(channel)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_2)).reserved as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_2),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_2 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_3 {
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_3() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_3>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_3)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_3>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_3)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_3)).reserved as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_3),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_3 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_4 {
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_4() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_4>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_4)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_4>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_4)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_4)).reserved as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_4),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_4 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_5 {
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_5() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_5>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_5)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_5>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_5)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_5)).reserved as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_5),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_5 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_1__bindgen_ty_6 {
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1__bindgen_ty_6() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1__bindgen_ty_6>(),
-        8usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_6)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1__bindgen_ty_6>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_6)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_1__bindgen_ty_6)).reserved as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1__bindgen_ty_6),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1__bindgen_ty_6 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_1() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_1>(),
-        8usize,
-        concat!("Size of: ", stringify!(edd_device_params__bindgen_ty_1))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_1>(),
-        1usize,
-        concat!("Alignment of ", stringify!(edd_device_params__bindgen_ty_1))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).isa as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(isa)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).pci as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(pci)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).ibnd as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(ibnd)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).xprs as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(xprs)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).htpt as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(htpt)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_1)).unknown as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_1),
-            "::",
-            stringify!(unknown)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_1 {
-    fn clone(&self) -> Self {
-        *self
+impl Default for edd_device_params__bindgen_ty_1 {
+    fn default() -> Self {
+        unsafe { ::std::mem::zeroed() }
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
-pub struct edd_device_params__bindgen_ty_2 {
-    pub ata: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_1>,
-    pub atapi: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_2>,
-    pub scsi: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_3>,
-    pub usb: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_4>,
-    pub i1394: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_5>,
-    pub fibre: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_6>,
-    pub i2o: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_7>,
-    pub raid: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_8>,
-    pub sata: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_9>,
-    pub unknown: __BindgenUnionField<edd_device_params__bindgen_ty_2__bindgen_ty_10>,
-    pub bindgen_union_field: [u8; 16usize],
+#[derive(Copy, Clone)]
+pub union edd_device_params__bindgen_ty_2 {
+    pub ata: edd_device_params__bindgen_ty_2__bindgen_ty_1,
+    pub atapi: edd_device_params__bindgen_ty_2__bindgen_ty_2,
+    pub scsi: edd_device_params__bindgen_ty_2__bindgen_ty_3,
+    pub usb: edd_device_params__bindgen_ty_2__bindgen_ty_4,
+    pub i1394: edd_device_params__bindgen_ty_2__bindgen_ty_5,
+    pub fibre: edd_device_params__bindgen_ty_2__bindgen_ty_6,
+    pub i2o: edd_device_params__bindgen_ty_2__bindgen_ty_7,
+    pub raid: edd_device_params__bindgen_ty_2__bindgen_ty_8,
+    pub sata: edd_device_params__bindgen_ty_2__bindgen_ty_9,
+    pub unknown: edd_device_params__bindgen_ty_2__bindgen_ty_10,
+    _bindgen_union_align: [u8; 16usize],
 }
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_1 {
     pub device: __u8,
     pub reserved1: __u8,
@@ -1355,97 +202,8 @@ pub struct edd_device_params__bindgen_ty_2__bindgen_ty_1 {
     pub reserved3: __u32,
     pub reserved4: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_1() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_1>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_1>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_1)).device as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1),
-            "::",
-            stringify!(device)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_1)).reserved1 as *const _
-                as usize
-        },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_1)).reserved2 as *const _
-                as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_1)).reserved3 as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1),
-            "::",
-            stringify!(reserved3)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_1)).reserved4 as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_1),
-            "::",
-            stringify!(reserved4)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_1 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_2 {
     pub device: __u8,
     pub lun: __u8,
@@ -1454,483 +212,47 @@ pub struct edd_device_params__bindgen_ty_2__bindgen_ty_2 {
     pub reserved3: __u32,
     pub reserved4: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_2() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_2>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_2>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).device as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(device)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).lun as *const _ as usize
-        },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(lun)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).reserved1 as *const _
-                as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).reserved2 as *const _
-                as usize
-        },
-        3usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).reserved3 as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(reserved3)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_2)).reserved4 as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_2),
-            "::",
-            stringify!(reserved4)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_2 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_3 {
     pub id: __u16,
     pub lun: __u64,
     pub reserved1: __u16,
     pub reserved2: __u32,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_3() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_3>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_3>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_3)).id as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3),
-            "::",
-            stringify!(id)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_3)).lun as *const _ as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3),
-            "::",
-            stringify!(lun)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_3)).reserved1 as *const _
-                as usize
-        },
-        10usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_3)).reserved2 as *const _
-                as usize
-        },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_3),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_3 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_4 {
     pub serial_number: __u64,
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_4() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_4>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_4)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_4>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_4)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_4)).serial_number
-                as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_4),
-            "::",
-            stringify!(serial_number)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_4)).reserved as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_4),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_4 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_5 {
     pub eui: __u64,
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_5() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_5>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_5)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_5>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_5)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_5)).eui as *const _ as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_5),
-            "::",
-            stringify!(eui)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_5)).reserved as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_5),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_5 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_6 {
     pub wwid: __u64,
     pub lun: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_6() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_6>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_6)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_6>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_6)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_6)).wwid as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_6),
-            "::",
-            stringify!(wwid)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_6)).lun as *const _ as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_6),
-            "::",
-            stringify!(lun)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_6 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_7 {
     pub identity_tag: __u64,
     pub reserved: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_7() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_7>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_7)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_7>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_7)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_7)).identity_tag as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_7),
-            "::",
-            stringify!(identity_tag)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_7)).reserved as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_7),
-            "::",
-            stringify!(reserved)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_7 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_8 {
     pub array_number: __u32,
     pub reserved1: __u32,
     pub reserved2: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_8() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_8>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_8)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_8>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_8)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_8)).array_number as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_8),
-            "::",
-            stringify!(array_number)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_8)).reserved1 as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_8),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_8)).reserved2 as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_8),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_8 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_9 {
     pub device: __u8,
     pub reserved1: __u8,
@@ -1938,469 +260,24 @@ pub struct edd_device_params__bindgen_ty_2__bindgen_ty_9 {
     pub reserved3: __u32,
     pub reserved4: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_9() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_9>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_9>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_9)).device as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9),
-            "::",
-            stringify!(device)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_9)).reserved1 as *const _
-                as usize
-        },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_9)).reserved2 as *const _
-                as usize
-        },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_9)).reserved3 as *const _
-                as usize
-        },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9),
-            "::",
-            stringify!(reserved3)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_9)).reserved4 as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_9),
-            "::",
-            stringify!(reserved4)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_9 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct edd_device_params__bindgen_ty_2__bindgen_ty_10 {
     pub reserved1: __u64,
     pub reserved2: __u64,
 }
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2__bindgen_ty_10() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2__bindgen_ty_10>(),
-        16usize,
-        concat!(
-            "Size of: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_10)
-        )
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2__bindgen_ty_10>(),
-        1usize,
-        concat!(
-            "Alignment of ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_10)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_10)).reserved1 as *const _
-                as usize
-        },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_10),
-            "::",
-            stringify!(reserved1)
-        )
-    );
-    assert_eq!(
-        unsafe {
-            &(*(0 as *const edd_device_params__bindgen_ty_2__bindgen_ty_10)).reserved2 as *const _
-                as usize
-        },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2__bindgen_ty_10),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2__bindgen_ty_10 {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[test]
-fn bindgen_test_layout_edd_device_params__bindgen_ty_2() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params__bindgen_ty_2>(),
-        16usize,
-        concat!("Size of: ", stringify!(edd_device_params__bindgen_ty_2))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params__bindgen_ty_2>(),
-        1usize,
-        concat!("Alignment of ", stringify!(edd_device_params__bindgen_ty_2))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).ata as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(ata)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).atapi as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(atapi)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).scsi as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(scsi)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).usb as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(usb)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).i1394 as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(i1394)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).fibre as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(fibre)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).i2o as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(i2o)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).raid as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(raid)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).sata as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(sata)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params__bindgen_ty_2)).unknown as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params__bindgen_ty_2),
-            "::",
-            stringify!(unknown)
-        )
-    );
-}
-impl Clone for edd_device_params__bindgen_ty_2 {
-    fn clone(&self) -> Self {
-        *self
+impl Default for edd_device_params__bindgen_ty_2 {
+    fn default() -> Self {
+        unsafe { ::std::mem::zeroed() }
     }
 }
-#[test]
-fn bindgen_test_layout_edd_device_params() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_device_params>(),
-        74usize,
-        concat!("Size of: ", stringify!(edd_device_params))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_device_params>(),
-        1usize,
-        concat!("Alignment of ", stringify!(edd_device_params))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).length as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(length)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).info_flags as *const _ as usize },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(info_flags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).num_default_cylinders as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(num_default_cylinders)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).num_default_heads as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(num_default_heads)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).sectors_per_track as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(sectors_per_track)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).number_of_sectors as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(number_of_sectors)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).bytes_per_sector as *const _ as usize },
-        24usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(bytes_per_sector)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).dpte_ptr as *const _ as usize },
-        26usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(dpte_ptr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).key as *const _ as usize },
-        30usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(key)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).device_path_info_length as *const _ as usize },
-        32usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(device_path_info_length)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).reserved2 as *const _ as usize },
-        33usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(reserved2)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).reserved3 as *const _ as usize },
-        34usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(reserved3)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).host_bus_type as *const _ as usize },
-        36usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(host_bus_type)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).interface_type as *const _ as usize },
-        40usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(interface_type)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).interface_path as *const _ as usize },
-        48usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(interface_path)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).device_path as *const _ as usize },
-        56usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(device_path)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).reserved4 as *const _ as usize },
-        72usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(reserved4)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_device_params)).checksum as *const _ as usize },
-        73usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_device_params),
-            "::",
-            stringify!(checksum)
-        )
-    );
-}
-impl Clone for edd_device_params {
-    fn clone(&self) -> Self {
-        *self
+impl Default for edd_device_params {
+    fn default() -> Self {
+        unsafe { ::std::mem::zeroed() }
     }
 }
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Copy, Clone)]
 pub struct edd_info {
     pub device: __u8,
     pub version: __u8,
@@ -2410,424 +287,39 @@ pub struct edd_info {
     pub legacy_sectors_per_track: __u8,
     pub params: edd_device_params,
 }
-#[test]
-fn bindgen_test_layout_edd_info() {
-    assert_eq!(
-        ::std::mem::size_of::<edd_info>(),
-        82usize,
-        concat!("Size of: ", stringify!(edd_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd_info>(),
-        1usize,
-        concat!("Alignment of ", stringify!(edd_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).device as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(device)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).version as *const _ as usize },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).interface_support as *const _ as usize },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(interface_support)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).legacy_max_cylinder as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(legacy_max_cylinder)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).legacy_max_head as *const _ as usize },
-        6usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(legacy_max_head)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).legacy_sectors_per_track as *const _ as usize },
-        7usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(legacy_sectors_per_track)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd_info)).params as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd_info),
-            "::",
-            stringify!(params)
-        )
-    );
-}
-impl Clone for edd_info {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[repr(C)]
-#[derive(Debug, Default, Copy)]
-pub struct edd {
-    pub mbr_signature: [::std::os::raw::c_uint; 16usize],
-    pub edd_info: [edd_info; 6usize],
-    pub mbr_signature_nr: ::std::os::raw::c_uchar,
-    pub edd_info_nr: ::std::os::raw::c_uchar,
-}
-#[test]
-fn bindgen_test_layout_edd() {
-    assert_eq!(
-        ::std::mem::size_of::<edd>(),
-        560usize,
-        concat!("Size of: ", stringify!(edd))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edd>(),
-        4usize,
-        concat!("Alignment of ", stringify!(edd))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd)).mbr_signature as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd),
-            "::",
-            stringify!(mbr_signature)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd)).edd_info as *const _ as usize },
-        64usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd),
-            "::",
-            stringify!(edd_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd)).mbr_signature_nr as *const _ as usize },
-        556usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd),
-            "::",
-            stringify!(mbr_signature_nr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edd)).edd_info_nr as *const _ as usize },
-        557usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edd),
-            "::",
-            stringify!(edd_info_nr)
-        )
-    );
-}
-impl Clone for edd {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
-pub struct e820entry {
-    pub addr: __u64,
-    pub size: __u64,
-    pub type_: __u32,
-}
-#[test]
-fn bindgen_test_layout_e820entry() {
-    assert_eq!(
-        ::std::mem::size_of::<e820entry>(),
-        20usize,
-        concat!("Size of: ", stringify!(e820entry))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<e820entry>(),
-        1usize,
-        concat!("Alignment of ", stringify!(e820entry))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const e820entry)).addr as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(e820entry),
-            "::",
-            stringify!(addr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const e820entry)).size as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(e820entry),
-            "::",
-            stringify!(size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const e820entry)).type_ as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(e820entry),
-            "::",
-            stringify!(type_)
-        )
-    );
-}
-impl Clone for e820entry {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-#[repr(C)]
-pub struct e820map {
-    pub nr_map: __u32,
-    pub map: [e820entry; 128usize],
-}
-#[test]
-fn bindgen_test_layout_e820map() {
-    assert_eq!(
-        ::std::mem::size_of::<e820map>(),
-        2564usize,
-        concat!("Size of: ", stringify!(e820map))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<e820map>(),
-        4usize,
-        concat!("Alignment of ", stringify!(e820map))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const e820map)).nr_map as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(e820map),
-            "::",
-            stringify!(nr_map)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const e820map)).map as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(e820map),
-            "::",
-            stringify!(map)
-        )
-    );
-}
-impl Default for e820map {
+impl Default for edd_info {
     fn default() -> Self {
         unsafe { ::std::mem::zeroed() }
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct ist_info {
     pub signature: __u32,
     pub command: __u32,
     pub event: __u32,
     pub perf_level: __u32,
 }
-#[test]
-fn bindgen_test_layout_ist_info() {
-    assert_eq!(
-        ::std::mem::size_of::<ist_info>(),
-        16usize,
-        concat!("Size of: ", stringify!(ist_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<ist_info>(),
-        4usize,
-        concat!("Alignment of ", stringify!(ist_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const ist_info)).signature as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(ist_info),
-            "::",
-            stringify!(signature)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const ist_info)).command as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(ist_info),
-            "::",
-            stringify!(command)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const ist_info)).event as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(ist_info),
-            "::",
-            stringify!(event)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const ist_info)).perf_level as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(ist_info),
-            "::",
-            stringify!(perf_level)
-        )
-    );
-}
-impl Clone for ist_info {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C)]
+#[derive(Copy, Clone)]
 pub struct edid_info {
     pub dummy: [::std::os::raw::c_uchar; 128usize],
 }
-#[test]
-fn bindgen_test_layout_edid_info() {
-    assert_eq!(
-        ::std::mem::size_of::<edid_info>(),
-        128usize,
-        concat!("Size of: ", stringify!(edid_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<edid_info>(),
-        1usize,
-        concat!("Alignment of ", stringify!(edid_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const edid_info)).dummy as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(edid_info),
-            "::",
-            stringify!(dummy)
-        )
-    );
-}
 impl Default for edid_info {
     fn default() -> Self {
         unsafe { ::std::mem::zeroed() }
     }
 }
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default)]
 pub struct setup_data {
     pub next: __u64,
     pub type_: __u32,
     pub len: __u32,
     pub data: __IncompleteArrayField<__u8>,
 }
-#[test]
-fn bindgen_test_layout_setup_data() {
-    assert_eq!(
-        ::std::mem::size_of::<setup_data>(),
-        16usize,
-        concat!("Size of: ", stringify!(setup_data))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<setup_data>(),
-        8usize,
-        concat!("Alignment of ", stringify!(setup_data))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_data)).next as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_data),
-            "::",
-            stringify!(next)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_data)).type_ as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_data),
-            "::",
-            stringify!(type_)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_data)).len as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_data),
-            "::",
-            stringify!(len)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_data)).data as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_data),
-            "::",
-            stringify!(data)
-        )
-    );
-}
-impl Clone for setup_data {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct setup_header {
     pub setup_sects: __u8,
     pub root_flags: __u16,
@@ -2840,7 +332,7 @@ pub struct setup_header {
     pub header: __u32,
     pub version: __u16,
     pub realmode_swtch: __u32,
-    pub start_sys: __u16,
+    pub start_sys_seg: __u16,
     pub kernel_version: __u16,
     pub type_of_loader: __u8,
     pub loadflags: __u8,
@@ -2868,516 +360,22 @@ pub struct setup_header {
     pub init_size: __u32,
     pub handover_offset: __u32,
 }
-#[test]
-fn bindgen_test_layout_setup_header() {
-    assert_eq!(
-        ::std::mem::size_of::<setup_header>(),
-        119usize,
-        concat!("Size of: ", stringify!(setup_header))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<setup_header>(),
-        1usize,
-        concat!("Alignment of ", stringify!(setup_header))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).setup_sects as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(setup_sects)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).root_flags as *const _ as usize },
-        1usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(root_flags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).syssize as *const _ as usize },
-        3usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(syssize)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).ram_size as *const _ as usize },
-        7usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(ram_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).vid_mode as *const _ as usize },
-        9usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(vid_mode)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).root_dev as *const _ as usize },
-        11usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(root_dev)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).boot_flag as *const _ as usize },
-        13usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(boot_flag)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).jump as *const _ as usize },
-        15usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(jump)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).header as *const _ as usize },
-        17usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(header)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).version as *const _ as usize },
-        21usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).realmode_swtch as *const _ as usize },
-        23usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(realmode_swtch)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).start_sys as *const _ as usize },
-        27usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(start_sys)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).kernel_version as *const _ as usize },
-        29usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(kernel_version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).type_of_loader as *const _ as usize },
-        31usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(type_of_loader)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).loadflags as *const _ as usize },
-        32usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(loadflags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).setup_move_size as *const _ as usize },
-        33usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(setup_move_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).code32_start as *const _ as usize },
-        35usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(code32_start)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).ramdisk_image as *const _ as usize },
-        39usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(ramdisk_image)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).ramdisk_size as *const _ as usize },
-        43usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(ramdisk_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).bootsect_kludge as *const _ as usize },
-        47usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(bootsect_kludge)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).heap_end_ptr as *const _ as usize },
-        51usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(heap_end_ptr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).ext_loader_ver as *const _ as usize },
-        53usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(ext_loader_ver)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).ext_loader_type as *const _ as usize },
-        54usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(ext_loader_type)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).cmd_line_ptr as *const _ as usize },
-        55usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(cmd_line_ptr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).initrd_addr_max as *const _ as usize },
-        59usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(initrd_addr_max)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).kernel_alignment as *const _ as usize },
-        63usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(kernel_alignment)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).relocatable_kernel as *const _ as usize },
-        67usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(relocatable_kernel)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).min_alignment as *const _ as usize },
-        68usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(min_alignment)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).xloadflags as *const _ as usize },
-        69usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(xloadflags)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).cmdline_size as *const _ as usize },
-        71usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(cmdline_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).hardware_subarch as *const _ as usize },
-        75usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(hardware_subarch)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).hardware_subarch_data as *const _ as usize },
-        79usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(hardware_subarch_data)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).payload_offset as *const _ as usize },
-        87usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(payload_offset)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).payload_length as *const _ as usize },
-        91usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(payload_length)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).setup_data as *const _ as usize },
-        95usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(setup_data)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).pref_address as *const _ as usize },
-        103usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(pref_address)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).init_size as *const _ as usize },
-        111usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(init_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const setup_header)).handover_offset as *const _ as usize },
-        115usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(setup_header),
-            "::",
-            stringify!(handover_offset)
-        )
-    );
-}
-impl Clone for setup_header {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct sys_desc_table {
     pub length: __u16,
     pub table: [__u8; 14usize],
 }
-#[test]
-fn bindgen_test_layout_sys_desc_table() {
-    assert_eq!(
-        ::std::mem::size_of::<sys_desc_table>(),
-        16usize,
-        concat!("Size of: ", stringify!(sys_desc_table))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<sys_desc_table>(),
-        2usize,
-        concat!("Alignment of ", stringify!(sys_desc_table))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const sys_desc_table)).length as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(sys_desc_table),
-            "::",
-            stringify!(length)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const sys_desc_table)).table as *const _ as usize },
-        2usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(sys_desc_table),
-            "::",
-            stringify!(table)
-        )
-    );
-}
-impl Clone for sys_desc_table {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C, packed)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct olpc_ofw_header {
     pub ofw_magic: __u32,
     pub ofw_version: __u32,
     pub cif_handler: __u32,
     pub irq_desc_table: __u32,
 }
-#[test]
-fn bindgen_test_layout_olpc_ofw_header() {
-    assert_eq!(
-        ::std::mem::size_of::<olpc_ofw_header>(),
-        16usize,
-        concat!("Size of: ", stringify!(olpc_ofw_header))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<olpc_ofw_header>(),
-        1usize,
-        concat!("Alignment of ", stringify!(olpc_ofw_header))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const olpc_ofw_header)).ofw_magic as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(olpc_ofw_header),
-            "::",
-            stringify!(ofw_magic)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const olpc_ofw_header)).ofw_version as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(olpc_ofw_header),
-            "::",
-            stringify!(ofw_version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const olpc_ofw_header)).cif_handler as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(olpc_ofw_header),
-            "::",
-            stringify!(cif_handler)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const olpc_ofw_header)).irq_desc_table as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(olpc_ofw_header),
-            "::",
-            stringify!(irq_desc_table)
-        )
-    );
-}
-impl Clone for olpc_ofw_header {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
 #[repr(C)]
-#[derive(Debug, Default, Copy)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct efi_info {
     pub efi_loader_signature: __u32,
     pub efi_systab: __u32,
@@ -3388,105 +386,15 @@ pub struct efi_info {
     pub efi_systab_hi: __u32,
     pub efi_memmap_hi: __u32,
 }
-#[test]
-fn bindgen_test_layout_efi_info() {
-    assert_eq!(
-        ::std::mem::size_of::<efi_info>(),
-        32usize,
-        concat!("Size of: ", stringify!(efi_info))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<efi_info>(),
-        4usize,
-        concat!("Alignment of ", stringify!(efi_info))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_loader_signature as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_loader_signature)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_systab as *const _ as usize },
-        4usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_systab)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_memdesc_size as *const _ as usize },
-        8usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_memdesc_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_memdesc_version as *const _ as usize },
-        12usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_memdesc_version)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_memmap as *const _ as usize },
-        16usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_memmap)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_memmap_size as *const _ as usize },
-        20usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_memmap_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_systab_hi as *const _ as usize },
-        24usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_systab_hi)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const efi_info)).efi_memmap_hi as *const _ as usize },
-        28usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(efi_info),
-            "::",
-            stringify!(efi_memmap_hi)
-        )
-    );
-}
-impl Clone for efi_info {
-    fn clone(&self) -> Self {
-        *self
-    }
+#[repr(C, packed)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct boot_e820_entry {
+    pub addr: __u64,
+    pub size: __u64,
+    pub type_: __u32,
 }
 #[repr(C, packed)]
+#[derive(Copy, Clone)]
 pub struct boot_params {
     pub screen_info: screen_info,
     pub apm_bios_info: apm_bios_info,
@@ -3510,359 +418,20 @@ pub struct boot_params {
     pub eddbuf_entries: __u8,
     pub edd_mbr_sig_buf_entries: __u8,
     pub kbd_status: __u8,
-    pub _pad5: [__u8; 3usize],
+    pub secure_boot: __u8,
+    pub _pad5: [__u8; 2usize],
     pub sentinel: __u8,
     pub _pad6: [__u8; 1usize],
     pub hdr: setup_header,
     pub _pad7: [__u8; 40usize],
     pub edd_mbr_sig_buffer: [__u32; 16usize],
-    pub e820_map: [e820entry; 128usize],
+    pub e820_table: [boot_e820_entry; 128usize],
     pub _pad8: [__u8; 48usize],
     pub eddbuf: [edd_info; 6usize],
     pub _pad9: [__u8; 276usize],
 }
-#[test]
-fn bindgen_test_layout_boot_params() {
-    assert_eq!(
-        ::std::mem::size_of::<boot_params>(),
-        4096usize,
-        concat!("Size of: ", stringify!(boot_params))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<boot_params>(),
-        1usize,
-        concat!("Alignment of ", stringify!(boot_params))
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).screen_info as *const _ as usize },
-        0usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(screen_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).apm_bios_info as *const _ as usize },
-        64usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(apm_bios_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad2 as *const _ as usize },
-        84usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad2)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).tboot_addr as *const _ as usize },
-        88usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(tboot_addr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).ist_info as *const _ as usize },
-        96usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(ist_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad3 as *const _ as usize },
-        112usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad3)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).hd0_info as *const _ as usize },
-        128usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(hd0_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).hd1_info as *const _ as usize },
-        144usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(hd1_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).sys_desc_table as *const _ as usize },
-        160usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(sys_desc_table)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).olpc_ofw_header as *const _ as usize },
-        176usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(olpc_ofw_header)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).ext_ramdisk_image as *const _ as usize },
-        192usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(ext_ramdisk_image)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).ext_ramdisk_size as *const _ as usize },
-        196usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(ext_ramdisk_size)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).ext_cmd_line_ptr as *const _ as usize },
-        200usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(ext_cmd_line_ptr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad4 as *const _ as usize },
-        204usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad4)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).edid_info as *const _ as usize },
-        320usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(edid_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).efi_info as *const _ as usize },
-        448usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(efi_info)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).alt_mem_k as *const _ as usize },
-        480usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(alt_mem_k)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).scratch as *const _ as usize },
-        484usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(scratch)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).e820_entries as *const _ as usize },
-        488usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(e820_entries)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).eddbuf_entries as *const _ as usize },
-        489usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(eddbuf_entries)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).edd_mbr_sig_buf_entries as *const _ as usize },
-        490usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(edd_mbr_sig_buf_entries)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).kbd_status as *const _ as usize },
-        491usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(kbd_status)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad5 as *const _ as usize },
-        492usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad5)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).sentinel as *const _ as usize },
-        495usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(sentinel)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad6 as *const _ as usize },
-        496usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad6)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).hdr as *const _ as usize },
-        497usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(hdr)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad7 as *const _ as usize },
-        616usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad7)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).edd_mbr_sig_buffer as *const _ as usize },
-        656usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(edd_mbr_sig_buffer)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).e820_map as *const _ as usize },
-        720usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(e820_map)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad8 as *const _ as usize },
-        3280usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad8)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params)).eddbuf as *const _ as usize },
-        3328usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(eddbuf)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(0 as *const boot_params))._pad9 as *const _ as usize },
-        3820usize,
-        concat!(
-            "Alignment of field: ",
-            stringify!(boot_params),
-            "::",
-            stringify!(_pad9)
-        )
-    );
-}
 impl Default for boot_params {
     fn default() -> Self {
         unsafe { ::std::mem::zeroed() }
     }
 }
-pub const X86_SUBARCH_PC: _bindgen_ty_1 = 0;
-pub const X86_SUBARCH_LGUEST: _bindgen_ty_1 = 1;
-pub const X86_SUBARCH_XEN: _bindgen_ty_1 = 2;
-pub const X86_SUBARCH_INTEL_MID: _bindgen_ty_1 = 3;
-pub const X86_SUBARCH_CE4100: _bindgen_ty_1 = 4;
-pub const X86_NR_SUBARCHS: _bindgen_ty_1 = 5;
-pub type _bindgen_ty_1 = ::std::os::raw::c_uint;
diff --git a/x86_64/src/fdt.rs b/x86_64/src/fdt.rs
index 30d74c9..655a812 100644
--- a/x86_64/src/fdt.rs
+++ b/x86_64/src/fdt.rs
@@ -4,13 +4,25 @@
 
 use arch::android::create_android_fdt;
 use arch::fdt::{begin_node, end_node, finish_fdt, start_fdt, Error};
+use data_model::DataInit;
 use std::fs::File;
 use std::mem;
 use sys_util::{GuestAddress, GuestMemory};
 
 use crate::bootparam::setup_data;
-use crate::bootparam::SETUP_DTB;
-use crate::X86_64_FDT_MAX_SIZE;
+use crate::{SETUP_DTB, X86_64_FDT_MAX_SIZE};
+
+// Like `setup_data` without the incomplete array field at the end, which allows us to safely
+// implement Copy, Clone, and DataInit.
+#[repr(C)]
+#[derive(Copy, Clone, Default)]
+struct setup_data_hdr {
+    pub next: u64,
+    pub type_: u32,
+    pub len: u32,
+}
+
+unsafe impl DataInit for setup_data_hdr {}
 
 /// Creates a flattened device tree containing all of the parameters for the
 /// kernel and loads it into the guest memory at the specified offset.
@@ -42,7 +54,11 @@ pub fn create_fdt(
     let mut fdt_final = vec![0; fdt_data_size];
     finish_fdt(&mut fdt, &mut fdt_final, fdt_data_size)?;
 
-    let mut hdr: setup_data = Default::default();
+    assert_eq!(
+        mem::size_of::<setup_data>(),
+        mem::size_of::<setup_data_hdr>()
+    );
+    let mut hdr: setup_data_hdr = Default::default();
     hdr.next = 0;
     hdr.type_ = SETUP_DTB;
     hdr.len = fdt_data_size as u32;
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index 5e54e69..ab5e3a8 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -4,6 +4,8 @@
 
 mod fdt;
 
+const E820_RAM: u32 = 1;
+const SETUP_DTB: u32 = 2;
 const X86_64_FDT_MAX_SIZE: u64 = 0x200000;
 
 #[allow(dead_code)]
@@ -11,22 +13,9 @@ const X86_64_FDT_MAX_SIZE: u64 = 0x200000;
 #[allow(non_camel_case_types)]
 #[allow(non_snake_case)]
 mod bootparam;
-// Bindgen didn't implement copy for boot_params because edid_info contains an array with len > 32.
-impl Copy for bootparam::edid_info {}
-impl Clone for bootparam::edid_info {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-impl Copy for bootparam::boot_params {}
-impl Clone for bootparam::boot_params {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
+
 // boot_params is just a series of ints, it is safe to initialize it.
 unsafe impl data_model::DataInit for bootparam::boot_params {}
-unsafe impl data_model::DataInit for bootparam::setup_data {}
 
 #[allow(dead_code)]
 #[allow(non_upper_case_globals)]
@@ -64,7 +53,6 @@ use std::mem;
 use std::sync::Arc;
 
 use crate::bootparam::boot_params;
-use crate::bootparam::E820_RAM;
 use arch::{RunnableLinuxVm, VmComponents};
 use devices::{get_serial_tty_string, PciConfigIo, PciDevice, PciInterruptPin, SerialParameters};
 use io_jail::Minijail;
@@ -258,13 +246,13 @@ fn configure_system(
 /// Add an e820 region to the e820 map.
 /// Returns Ok(()) if successful, or an error if there is no space left in the map.
 fn add_e820_entry(params: &mut boot_params, addr: u64, size: u64, mem_type: u32) -> Result<()> {
-    if params.e820_entries >= params.e820_map.len() as u8 {
+    if params.e820_entries >= params.e820_table.len() as u8 {
         return Err(Error::E820Configuration);
     }
 
-    params.e820_map[params.e820_entries as usize].addr = addr;
-    params.e820_map[params.e820_entries as usize].size = size;
-    params.e820_map[params.e820_entries as usize].type_ = mem_type;
+    params.e820_table[params.e820_entries as usize].addr = addr;
+    params.e820_table[params.e820_entries as usize].size = size;
+    params.e820_table[params.e820_entries as usize].type_ = mem_type;
     params.e820_entries += 1;
 
     Ok(())