Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

xen/arch/x86/apic.c

@@ -1474,7 +1474,7 @@ enum apic_mode current_local_apic_mode(void)
 
     /* Reading EXTD bit from the MSR is only valid if CPUID
      * says so, else reserved */
-    if ( cpu_has(&current_cpu_data, X86_FEATURE_X2APIC)
+    if ( boot_cpu_has(X86_FEATURE_X2APIC)
          && (msr_contents & MSR_IA32_APICBASE_EXTD) )
         return APIC_MODE_X2APIC;
 

xen/arch/x86/efi/boot.c

@@ -1241,12 +1241,14 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     setup_efi_pci();
 
     /* Get snapshot of variable store parameters. */
-    status = efi_rs->QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE |
+    status = (efi_rs->Hdr.Revision >> 16) >= 2 ?
+             efi_rs->QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE |
                                        EFI_VARIABLE_BOOTSERVICE_ACCESS |
                                        EFI_VARIABLE_RUNTIME_ACCESS,
                                        &efi_boot_max_var_store_size,
                                        &efi_boot_remain_var_store_size,
-                                       &efi_boot_max_var_size);
+                                       &efi_boot_max_var_size) :
+             EFI_INCOMPATIBLE_VERSION;
     if ( EFI_ERROR(status) )
     {
         efi_boot_max_var_store_size = 0;