--- /dev/null
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
+@@ -422,7 +422,7 @@ static inline int fault_in_pages_writeab
+
+ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
+ {
+- volatile char c;
++ volatile char c __maybe_unused;
+ int ret;
+
+ if (unlikely(size == 0))
--- /dev/null
+--- a/arch/powerpc/include/asm/pgtable-ppc64.h
++++ b/arch/powerpc/include/asm/pgtable-ppc64.h
+@@ -226,7 +226,7 @@ static inline int __ptep_test_and_clear_
+ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep)
+ {
+- unsigned long old;
++ unsigned long old __maybe_unused;
+
+ if ((pte_val(*ptep) & _PAGE_RW) == 0)
+ return;
+@@ -236,7 +236,7 @@ static inline void ptep_set_wrprotect(st
+ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
+ unsigned long addr, pte_t *ptep)
+ {
+- unsigned long old;
++ unsigned long old __maybe_unused;
+
+ if ((pte_val(*ptep) & _PAGE_RW) == 0)
+ return;
--- /dev/null
+--- a/include/sound/soc-dai.h
++++ b/include/sound/soc-dai.h
+@@ -223,7 +223,7 @@ struct snd_soc_dai {
+ union {
+ struct snd_soc_codec *codec;
+ struct snd_soc_platform *platform;
+- };
++ } parent;
+
+ struct list_head list;
+ };