Merge branch 'linus' into x86/pti to pick up upstream changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 936e196..cb1d8a3 100644 (file)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -913,7 +913,7 @@ ENTRY(\sym)
        pushq   $-1                             /* ORIG_RAX: no syscall to restart */
        .endif
 
-       .if \paranoid < 2
+       .if \paranoid == 1
        testb   $3, CS-ORIG_RAX(%rsp)           /* If coming from userspace, switch stacks */
        jnz     .Lfrom_usermode_switch_stack_\@
        .endif
@@ -960,7 +960,7 @@ ENTRY(\sym)
        jmp     error_exit
        .endif
 
-       .if \paranoid < 2
+       .if \paranoid == 1
        /*
         * Entry from userspace.  Switch stacks and treat it
         * as a normal entry.  This means that paranoid handlers

diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index aebf603..a06cbf0 100644 (file)
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -137,15 +137,15 @@ struct boot_e820_entry {
  * setup data structure.
  */
 struct jailhouse_setup_data {
-       u16     version;
-       u16     compatible_version;
-       u16     pm_timer_address;
-       u16     num_cpus;
-       u64     pci_mmconfig_base;
-       u32     tsc_khz;
-       u32     apic_khz;
-       u8      standard_ioapic;
-       u8      cpu_ids[255];
+       __u16   version;
+       __u16   compatible_version;
+       __u16   pm_timer_address;
+       __u16   num_cpus;
+       __u64   pci_mmconfig_base;
+       __u32   tsc_khz;
+       __u32   apic_khz;
+       __u8    standard_ioapic;
+       __u8    cpu_ids[255];
 } __attribute__((packed));
 
 /* The so-called "zeropage" */