25 files changed, 115 insertions, 105 deletions

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 66d1d45fa2e1..d356f802945a 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -1026,7 +1026,8 @@ static inline void __iomem *ioremap_wt(phys_addr_t offset, size_t size)
 #define ioport_map ioport_map
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
-        return PCI_IOBASE + (port & MMIO_UPPER_LIMIT);
+        port &= IO_SPACE_LIMIT;
+        return (port > MMIO_UPPER_LIMIT) ? NULL : PCI_IOBASE + port;
 }
 #endif
 
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 46a8009784df..152b3055e9e1 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -675,7 +675,7 @@ static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
 static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
 {
         return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
-                dev->mode_config.funcs->atomic_commit != NULL;
+                (dev->mode_config.funcs && dev->mode_config.funcs->atomic_commit != NULL);
 }
 
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d6869e0e2b64..6980014357d4 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -54,7 +54,7 @@ struct blk_stat_callback;
  * Maximum number of blkcg policies allowed to be registered concurrently.
  * Defined here to simplify include dependency.
  */
-#define BLKCG_MAX_POLS          3
+#define BLKCG_MAX_POLS          5
 
 typedef void (rq_end_io_fn)(struct request *, blk_status_t);
 
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 763bbad1e258..4d36b27214fd 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -79,20 +79,6 @@
 #define __noretpoline __attribute__((indirect_branch("keep")))
 #endif
 
-/*
- * it doesn't make sense on ARM (currently the only user of __naked)
- * to trace naked functions because then mcount is called without
- * stack and frame pointer being set up and there is no chance to
- * restore the lr register to the value before mcount was called.
- *
- * The asm() bodies of naked functions often depend on standard calling
- * conventions, therefore they must be noinline and noclone.
- *
- * GCC 4.[56] currently fail to enforce this, so we must do so ourselves.
- * See GCC PR44290.
- */
-#define __naked         __attribute__((naked)) noinline __noclone notrace
-
 #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
 
 #define __optimize(level)       __attribute__((__optimize__(level)))
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 3525c179698c..db192becfec4 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -226,6 +226,14 @@ struct ftrace_likely_data {
 #define notrace                 __attribute__((no_instrument_function))
 #endif
 
+/*
+ * it doesn't make sense on ARM (currently the only user of __naked)
+ * to trace naked functions because then mcount is called without
+ * stack and frame pointer being set up and there is no chance to
+ * restore the lr register to the value before mcount was called.
+ */
+#define __naked                 __attribute__((naked)) notrace
+
 #define __compiler_offsetof(a, b)       __builtin_offsetof(a, b)
 
 /*
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 33322702c910..6c0b4a1c22ff 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1763,6 +1763,7 @@ struct file_operations {
                         u64);
         int (*dedupe_file_range)(struct file *, loff_t, struct file *, loff_t,
                         u64);
+        int (*fadvise)(struct file *, loff_t, loff_t, int);
 } __randomize_layout;
 
 struct inode_operations {
@@ -3459,4 +3460,8 @@ static inline bool dir_relax_shared(struct inode *inode)
 extern bool path_noexec(const struct path *path);
 extern void inode_nohighmem(struct inode *inode);
 
+/* mm/fadvise.c */
+extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len,
+                       int advice);
+
 #endif /* _LINUX_FS_H */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 57864422a2c8..25c08c6c7f99 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -83,10 +83,10 @@ struct partition {
 } __attribute__((packed));
 
 struct disk_stats {
+        u64 nsecs[NR_STAT_GROUPS];
         unsigned long sectors[NR_STAT_GROUPS];
         unsigned long ios[NR_STAT_GROUPS];
         unsigned long merges[NR_STAT_GROUPS];
-        unsigned long ticks[NR_STAT_GROUPS];
         unsigned long io_ticks;
         unsigned long time_in_queue;
 };
@@ -354,6 +354,9 @@ static inline void free_part_stats(struct hd_struct *part)
 
 #endif /* CONFIG_SMP */
 
+#define part_stat_read_msecs(part, which)                               \
+        div_u64(part_stat_read(part, nsecs[which]), NSEC_PER_MSEC)
+
 #define part_stat_read_accum(part, field)                               \
         (part_stat_read(part, field[STAT_READ]) +                       \
          part_stat_read(part, field[STAT_WRITE]) +                      \
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 834e6461a690..d44a78362942 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -526,6 +526,7 @@ struct hid_input {
         const char *name;
         bool registered;
         struct list_head reports;       /* the list of reports */
+        unsigned int application;       /* application usage for this input */
 };
 
 enum hid_type {
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0205aee44ded..c926698040e0 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -733,8 +733,6 @@ bool kvm_vcpu_wake_up(struct kvm_vcpu *vcpu);
 void kvm_vcpu_kick(struct kvm_vcpu *vcpu);
 int kvm_vcpu_yield_to(struct kvm_vcpu *target);
 void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu, bool usermode_vcpu_not_eligible);
-void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
-void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
 
 void kvm_flush_remote_tlbs(struct kvm *kvm);
 void kvm_reload_remote_mmus(struct kvm *kvm);
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h
index 8a125701ef7b..50bed4f89c1a 100644
--- a/include/linux/mfd/da9063/pdata.h
+++ b/include/linux/mfd/da9063/pdata.h
@@ -21,7 +21,7 @@
 /*
  * Regulator configuration
  */
-/* DA9063 regulator IDs */
+/* DA9063 and DA9063L regulator IDs */
 enum {
         /* BUCKs */
         DA9063_ID_BCORE1,
@@ -37,18 +37,20 @@ enum {
         DA9063_ID_BMEM_BIO_MERGED,
         /* When two BUCKs are merged, they cannot be reused separately */
 
-        /* LDOs */
+        /* LDOs on both DA9063 and DA9063L */
+        DA9063_ID_LDO3,
+        DA9063_ID_LDO7,
+        DA9063_ID_LDO8,
+        DA9063_ID_LDO9,
+        DA9063_ID_LDO11,
+
+        /* DA9063-only LDOs */
         DA9063_ID_LDO1,
         DA9063_ID_LDO2,
-        DA9063_ID_LDO3,
         DA9063_ID_LDO4,
         DA9063_ID_LDO5,
         DA9063_ID_LDO6,
-        DA9063_ID_LDO7,
-        DA9063_ID_LDO8,
-        DA9063_ID_LDO9,
         DA9063_ID_LDO10,
-        DA9063_ID_LDO11,
 };
 
 /* Regulators platform data */
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 7a452716de4b..66d94b4557cf 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -362,8 +362,8 @@ struct mlx5_frag_buf {
 struct mlx5_frag_buf_ctrl {
         struct mlx5_frag_buf    frag_buf;
         u32                     sz_m1;
-        u32                     frag_sz_m1;
-        u32                     strides_offset;
+        u16                     frag_sz_m1;
+        u16                     strides_offset;
         u8                      log_sz;
         u8                      log_stride;
         u8                      log_frag_strides;
@@ -995,7 +995,7 @@ static inline u32 mlx5_base_mkey(const u32 key)
 }
 
 static inline void mlx5_fill_fbc_offset(u8 log_stride, u8 log_sz,
-                                        u32 strides_offset,
+                                        u16 strides_offset,
                                         struct mlx5_frag_buf_ctrl *fbc)
 {
         fbc->log_stride = log_stride;
@@ -1052,7 +1052,7 @@ int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn);
 void mlx5_health_cleanup(struct mlx5_core_dev *dev);
 int mlx5_health_init(struct mlx5_core_dev *dev);
 void mlx5_start_health_poll(struct mlx5_core_dev *dev);
-void mlx5_stop_health_poll(struct mlx5_core_dev *dev);
+void mlx5_stop_health_poll(struct mlx5_core_dev *dev, bool disable_health);
 void mlx5_drain_health_wq(struct mlx5_core_dev *dev);
 void mlx5_trigger_health_work(struct mlx5_core_dev *dev);
 void mlx5_drain_health_recovery(struct mlx5_core_dev *dev);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index cd2bc939efd0..5ed8f6292a53 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -341,7 +341,7 @@ struct mm_struct {
         struct {
                 struct vm_area_struct *mmap;            /* list of VMAs */
                 struct rb_root mm_rb;
-                u32 vmacache_seqnum;                   /* per-thread vmacache */
+                u64 vmacache_seqnum;                   /* per-thread vmacache */
 #ifdef CONFIG_MMU
                 unsigned long (*get_unmapped_area) (struct file *filp,
                                 unsigned long addr, unsigned long len,
diff --git a/include/linux/mm_types_task.h b/include/linux/mm_types_task.h
index 5fe87687664c..d7016dcb245e 100644
--- a/include/linux/mm_types_task.h
+++ b/include/linux/mm_types_task.h
@@ -32,7 +32,7 @@
 #define VMACACHE_MASK (VMACACHE_SIZE - 1)
 
 struct vmacache {
-        u32 seqnum;
+        u64 seqnum;
         struct vm_area_struct *vmas[VMACACHE_SIZE];
 };
 
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 1298a7daa57d..01797cb4587e 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -754,6 +754,7 @@ struct tb_service_id {
  * struct typec_device_id - USB Type-C alternate mode identifiers
  * @svid: Standard or Vendor ID
  * @mode: Mode index
+ * @driver_data: Driver specific data
  */
 struct typec_device_id {
         __u16 svid;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e72ca8dd6241..6925828f9f25 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1235,6 +1235,9 @@ void pci_bus_remove_resources(struct pci_bus *bus);
 int devm_request_pci_bus_resources(struct device *dev,
                                    struct list_head *resources);
 
+/* Temporary until new and working PCI SBR API in place */
+int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
+
 #define pci_bus_for_each_resource(bus, res, i)                          \
         for (i = 0;                                                     \
             (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \
diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index a34539b7f750..7e6ac0114d55 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -133,15 +133,18 @@ struct vga_switcheroo_handler {
  * @can_switch: check if the device is in a position to switch now.
  *      Mandatory. The client should return false if a user space process
  *      has one of its device files open
+ * @gpu_bound: notify the client id to audio client when the GPU is bound.
  *
  * Client callbacks. A client can be either a GPU or an audio device on a GPU.
  * The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be
  * set to NULL. For audio clients, the @reprobe member is bogus.
+ * OTOH, @gpu_bound is only for audio clients, and not used for GPU clients.
  */
 struct vga_switcheroo_client_ops {
         void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);
         void (*reprobe)(struct pci_dev *dev);
         bool (*can_switch)(struct pci_dev *dev);
+        void (*gpu_bound)(struct pci_dev *dev, enum vga_switcheroo_client_id);
 };
 
 #if defined(CONFIG_VGA_SWITCHEROO)
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index 5c7f010676a7..47a3441cf4c4 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -105,7 +105,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
 #ifdef CONFIG_DEBUG_VM_VMACACHE
                 VMACACHE_FIND_CALLS,
                 VMACACHE_FIND_HITS,
-                VMACACHE_FULL_FLUSHES,
 #endif
 #ifdef CONFIG_SWAP
                 SWAP_RA,
diff --git a/include/linux/vmacache.h b/include/linux/vmacache.h
index 3e9a963edd6a..6fce268a4588 100644
--- a/include/linux/vmacache.h
+++ b/include/linux/vmacache.h
@@ -10,7 +10,6 @@ static inline void vmacache_flush(struct task_struct *tsk)
         memset(tsk->vmacache.vmas, 0, sizeof(tsk->vmacache.vmas));
 }
 
-extern void vmacache_flush_all(struct mm_struct *mm);
 extern void vmacache_update(unsigned long addr, struct vm_area_struct *newvma);
 extern struct vm_area_struct *vmacache_find(struct mm_struct *mm,
                                                     unsigned long addr);
@@ -24,10 +23,6 @@ extern struct vm_area_struct *vmacache_find_exact(struct mm_struct *mm,
 static inline void vmacache_invalidate(struct mm_struct *mm)
 {
         mm->vmacache_seqnum++;
-
-        /* deal with overflows */
-        if (unlikely(mm->vmacache_seqnum == 0))
-                vmacache_flush_all(mm);
 }
 
 #endif /* __LINUX_VMACACHE_H */
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
index d5f62cc6c2ae..3394d75e1c80 100644
--- a/include/net/netfilter/nf_conntrack_timeout.h
+++ b/include/net/netfilter/nf_conntrack_timeout.h
@@ -30,7 +30,7 @@ struct nf_conn_timeout {
 };
 
 static inline unsigned int *
-nf_ct_timeout_data(struct nf_conn_timeout *t)
+nf_ct_timeout_data(const struct nf_conn_timeout *t)
 {
         struct nf_ct_timeout *timeout;
 
diff --git a/include/net/tls.h b/include/net/tls.h
index d5c683e8bb22..0a769cf2f5f3 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -171,15 +171,14 @@ struct cipher_context {
         char *rec_seq;
 };
 
+union tls_crypto_context {
+        struct tls_crypto_info info;
+        struct tls12_crypto_info_aes_gcm_128 aes_gcm_128;
+};
+
 struct tls_context {
-        union {
-                struct tls_crypto_info crypto_send;
-                struct tls12_crypto_info_aes_gcm_128 crypto_send_aes_gcm_128;
-        };
-        union {
-                struct tls_crypto_info crypto_recv;
-                struct tls12_crypto_info_aes_gcm_128 crypto_recv_aes_gcm_128;
-        };
+        union tls_crypto_context crypto_send;
+        union tls_crypto_context crypto_recv;
 
         struct list_head list;
         struct net_device *netdev;
@@ -367,8 +366,8 @@ static inline void tls_fill_prepend(struct tls_context *ctx,
          * size KTLS_DTLS_HEADER_SIZE + KTLS_DTLS_NONCE_EXPLICIT_SIZE
          */
         buf[0] = record_type;
-        buf[1] = TLS_VERSION_MINOR(ctx->crypto_send.version);
-        buf[2] = TLS_VERSION_MAJOR(ctx->crypto_send.version);
+        buf[1] = TLS_VERSION_MINOR(ctx->crypto_send.info.version);
+        buf[2] = TLS_VERSION_MAJOR(ctx->crypto_send.info.version);
         /* we can use IV for nonce explicit according to spec */
         buf[3] = pkt_len >> 8;
         buf[4] = pkt_len & 0xFF;
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 6f1e1f3b3063..cd1773d0e08f 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -412,6 +412,7 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus);
 void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus);
 void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);
 void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);
+int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset);
 
 void snd_hdac_bus_update_rirb(struct hdac_bus *bus);
 int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index af9ef16cc34d..fdaaafdc7a00 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -407,6 +407,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
 void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
+                         struct snd_soc_pcm_runtime *rtd,
                          const struct snd_soc_pcm_stream *params,
                          unsigned int num_params,
                          struct snd_soc_dapm_widget *source,
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 07548de5c988..251be353f950 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_S390_HPAGE_1M 156
 #define KVM_CAP_NESTED_STATE 157
 #define KVM_CAP_ARM_INJECT_SERROR_ESR 158
+#define KVM_CAP_MSR_PLATFORM_INFO 159
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index f58cafa42f18..f39352cef382 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -10,6 +10,8 @@
 #ifndef __HDA_TPLG_INTERFACE_H__
 #define __HDA_TPLG_INTERFACE_H__
 
+#include <linux/types.h>
+
 /*
  * Default types range from 0~12. type can range from 0 to 0xff
  * SST types start at higher to avoid any overlapping in future
@@ -143,10 +145,10 @@ enum skl_module_param_type {
 };
 
 struct skl_dfw_algo_data {
-        u32 set_params:2;
-        u32 rsvd:30;
-        u32 param_id;
-        u32 max;
+        __u32 set_params:2;
+        __u32 rsvd:30;
+        __u32 param_id;
+        __u32 max;
         char params[0];
 } __packed;
 
@@ -163,68 +165,68 @@ enum skl_tuple_type {
 /* v4 configuration data */
 
 struct skl_dfw_v4_module_pin {
-        u16 module_id;
-        u16 instance_id;
+        __u16 module_id;
+        __u16 instance_id;
 } __packed;
 
 struct skl_dfw_v4_module_fmt {
-        u32 channels;
-        u32 freq;
-        u32 bit_depth;
-        u32 valid_bit_depth;
-        u32 ch_cfg;
-        u32 interleaving_style;
-        u32 sample_type;
-        u32 ch_map;
+        __u32 channels;
+        __u32 freq;
+        __u32 bit_depth;
+        __u32 valid_bit_depth;
+        __u32 ch_cfg;
+        __u32 interleaving_style;
+        __u32 sample_type;
+        __u32 ch_map;
 } __packed;
 
 struct skl_dfw_v4_module_caps {
-        u32 set_params:2;
-        u32 rsvd:30;
-        u32 param_id;
-        u32 caps_size;
-        u32 caps[HDA_SST_CFG_MAX];
+        __u32 set_params:2;
+        __u32 rsvd:30;
+        __u32 param_id;
+        __u32 caps_size;
+        __u32 caps[HDA_SST_CFG_MAX];
 } __packed;
 
 struct skl_dfw_v4_pipe {
-        u8 pipe_id;
-        u8 pipe_priority;
-        u16 conn_type:4;
-        u16 rsvd:4;
-        u16 memory_pages:8;
+        __u8 pipe_id;
+        __u8 pipe_priority;
+        __u16 conn_type:4;
+        __u16 rsvd:4;
+        __u16 memory_pages:8;
 } __packed;
 
 struct skl_dfw_v4_module {
         char uuid[SKL_UUID_STR_SZ];
 
-        u16 module_id;
-        u16 instance_id;
-        u32 max_mcps;
-        u32 mem_pages;
-        u32 obs;
-        u32 ibs;
-        u32 vbus_id;
-
-        u32 max_in_queue:8;
-        u32 max_out_queue:8;
-        u32 time_slot:8;
-        u32 core_id:4;
-        u32 rsvd1:4;
-
-        u32 module_type:8;
-        u32 conn_type:4;
-        u32 dev_type:4;
-        u32 hw_conn_type:4;
-        u32 rsvd2:12;
-
-        u32 params_fixup:8;
-        u32 converter:8;
-        u32 input_pin_type:1;
-        u32 output_pin_type:1;
-        u32 is_dynamic_in_pin:1;
-        u32 is_dynamic_out_pin:1;
-        u32 is_loadable:1;
-        u32 rsvd3:11;
+        __u16 module_id;
+        __u16 instance_id;
+        __u32 max_mcps;
+        __u32 mem_pages;
+        __u32 obs;
+        __u32 ibs;
+        __u32 vbus_id;
+
+        __u32 max_in_queue:8;
+        __u32 max_out_queue:8;
+        __u32 time_slot:8;
+        __u32 core_id:4;
+        __u32 rsvd1:4;
+
+        __u32 module_type:8;
+        __u32 conn_type:4;
+        __u32 dev_type:4;
+        __u32 hw_conn_type:4;
+        __u32 rsvd2:12;
+
+        __u32 params_fixup:8;
+        __u32 converter:8;
+        __u32 input_pin_type:1;
+        __u32 output_pin_type:1;
+        __u32 is_dynamic_in_pin:1;
+        __u32 is_dynamic_out_pin:1;
+        __u32 is_loadable:1;
+        __u32 rsvd3:11;
 
         struct skl_dfw_v4_pipe pipe;
         struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE];
diff --git a/include/xen/mem-reservation.h b/include/xen/mem-reservation.h
index 80b52b4945e9..a2ab516fcd2c 100644
--- a/include/xen/mem-reservation.h
+++ b/include/xen/mem-reservation.h
@@ -17,11 +17,12 @@
 
 #include <xen/page.h>
 
+extern bool xen_scrub_pages;
+
 static inline void xenmem_reservation_scrub_page(struct page *page)
 {
-#ifdef CONFIG_XEN_SCRUB_PAGES
-        clear_highpage(page);
-#endif
+        if (xen_scrub_pages)
+                clear_highpage(page);
 }
 
 #ifdef CONFIG_XEN_HAVE_PVMMU