diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 4fb9e88d466c2a56d38bb9e4b74541fdda1044b6..7dd5d9cf4f4c0cf78a190156a8fe8583d8c0167e 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -171,7 +171,7 @@ static int c_show(struct seq_file *m, void *v)
 		 * rather than attempting to parse this, but there's a body of
 		 * software which does already (at least for 32-bit).
 		 */
-		seq_puts(m, "flags\t\t:");
+		seq_puts(m, "Features\t:");
 		if (compat) {
 #ifdef CONFIG_COMPAT
 			for (j = 0; compat_hwcap_str[j]; j++)
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index faa798839971a5e392b9ce7f6b38d977d98f1bbb..f23a955f96e4287bf3a4e888c5a06f15de8c2b04 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -5,7 +5,7 @@
 #include <asm/perf_event.h>
 #include <asm/msr.h>
 #include <asm/insn.h>
-
+#include <linux/slab.h>
 #include "../perf_event.h"
 
 static const enum {
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index c0538f82c9a220cfafbb20d7d954eff6eff5053e..ff9fe5238924a2d8724c03d9f22a91ab64671cbf 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -5,6 +5,7 @@
 #include <linux/cpumask.h>
 #include <asm/percpu.h>
 
+#include <linux/thread_info.h>
 #include <asm/thread_info.h>
 #include <asm/cpumask.h>
 
diff --git a/include/linux/ioasid.h b/include/linux/ioasid.h
index 02be9292a74a4ac4c58040da1858a454f246e723..8d5e6b9fea9fe9b879ae21eecd07350cc236e14e 100644
--- a/include/linux/ioasid.h
+++ b/include/linux/ioasid.h
@@ -211,7 +211,7 @@ static inline ioasid_t ioasid_alloc(struct ioasid_set *set, ioasid_t min,
 }
 
 static inline struct ioasid_set *ioasid_set_alloc(void *token, ioasid_t quota,
-						  ioasid_set_type type)
+						  int type)
 {
 	return ERR_PTR(-ENOTSUPP);
 }
@@ -333,5 +333,32 @@ static inline bool ioasid_queue_work(struct work_struct *work)
 {
 	return false;
 }
+
+/* No cgroup control, allocation will proceed until run out total pool */
+static inline int ioasid_cg_charge(struct ioasid_set *set)
+{
+	return 0;
+}
+
+static inline int ioasid_cg_uncharge(struct ioasid_set *set)
+{
+	return 0;
+}
+
+static inline struct ioasid_user *
+ioasid_user_get_from_task(struct task_struct *task)
+{
+	return ERR_PTR(-ENOTTY);
+}
+
+static inline void ioasid_user_put(struct ioasid_user *iuser)
+{
+}
+
+static inline void ioasid_user_for_each_id(struct ioasid_user *iuser, void *data,
+					  void (*fn)(ioasid_t id, void *data))
+{
+}
+
 #endif /* CONFIG_IOASID */
 #endif /* __LINUX_IOASID_H */
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 51e0ebfa9639c9e4248fe5ba74b5baaf46db4975..48cd105f6ff2272577adf9b718b19fe9c3e8a057 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -1182,7 +1182,7 @@ static inline void sva_suspend_pasid(struct device *dev, u32 pasid)
 {
 }
 
-static inline void (*sva_resume_pasid)(struct device *dev, u32 pasid)
+static inline void sva_resume_pasid(struct device *dev, u32 pasid)
 {
 }