remove some annoying warnings and fix snd modules build
SVN-Revision: 31365
This commit is contained in:
parent
eadf592371
commit
147646fc66
3 changed files with 42 additions and 0 deletions
|
@ -0,0 +1,11 @@
|
||||||
|
--- 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))
|
|
@ -0,0 +1,20 @@
|
||||||
|
--- 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;
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- 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;
|
||||||
|
};
|
Loading…
Reference in a new issue