Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 6 insertions, 1 deletions

diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
index 9e5f3c722c33..981fe923a59f 100644
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -70,6 +70,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
                         BOOT_PARAM_PRESERVE(eddbuf_entries),
                         BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
                         BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
+                        BOOT_PARAM_PRESERVE(secure_boot),
                         BOOT_PARAM_PRESERVE(hdr),
                         BOOT_PARAM_PRESERVE(e820_table),
                         BOOT_PARAM_PRESERVE(eddbuf),
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 74e88e5edd9c..bdc16b0aa7c6 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -335,6 +335,7 @@ struct kvm_mmu_page {
         int root_count;          /* Currently serving as active root */
         unsigned int unsync_children;
         struct kvm_rmap_head parent_ptes; /* rmap pointers to parent sptes */
+        unsigned long mmu_valid_gen;
         DECLARE_BITMAP(unsync_child_bitmap, 512);
 
 #ifdef CONFIG_X86_32
@@ -856,6 +857,7 @@ struct kvm_arch {
         unsigned long n_requested_mmu_pages;
         unsigned long n_max_mmu_pages;
         unsigned int indirect_shadow_pages;
+        unsigned long mmu_valid_gen;
         struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
         /*
          * Hash table of struct kvm_mmu_page.
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 9c4435307ff8..35c225ede0e4 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -444,8 +444,10 @@ __pu_label:							\
 ({                                                                      \
         int __gu_err;                                                   \
         __inttype(*(ptr)) __gu_val;                                     \
+        __typeof__(ptr) __gu_ptr = (ptr);                               \
+        __typeof__(size) __gu_size = (size);                            \
         __uaccess_begin_nospec();                                       \
-        __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);    \
+        __get_user_size(__gu_val, __gu_ptr, __gu_size, __gu_err, -EFAULT);      \
         __uaccess_end();                                                \
         (x) = (__force __typeof__(*(ptr)))__gu_val;                     \
         __builtin_expect(__gu_err, 0);                                  \