| Message ID | 1488920133-27229-14-git-send-email-labbott@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 07 Mar 2017 21:55:30 +0100, Laura Abbott wrote: > > set_memory_* functions have moved to set_memory.h. Switch to this > explicitly. > > Signed-off-by: Laura Abbott <labbott@redhat.com> > --- > v3: Add a few other files caught by 0day bot I hoped we could get rid of the ifdef, but other than that, feel free to take my ack for the sound part: Acked-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi > --- > sound/pci/hda/hda_intel.c | 2 +- > sound/pci/intel8x0.c | 4 +++- > sound/x86/intel_hdmi_audio.c | 2 +- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index c8256a8..64d6a34 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -53,7 +53,7 @@ > #ifdef CONFIG_X86 > /* for snoop control */ > #include <asm/pgtable.h> > -#include <asm/cacheflush.h> > +#include <asm/set_memory.h> > #include <asm/cpufeature.h> > #endif > #include <sound/core.h> > diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c > index 9720a30..6d17b17 100644 > --- a/sound/pci/intel8x0.c > +++ b/sound/pci/intel8x0.c > @@ -40,7 +40,9 @@ > #include <sound/initval.h> > /* for 440MX workaround */ > #include <asm/pgtable.h> > -#include <asm/cacheflush.h> > +#ifdef CONFIG_X86 > +#include <asm/set_memory.h> > +#endif > > MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); > MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455"); > diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c > index c505b01..664b7fe 100644 > --- a/sound/x86/intel_hdmi_audio.c > +++ b/sound/x86/intel_hdmi_audio.c > @@ -30,7 +30,7 @@ > #include <linux/pm_runtime.h> > #include <linux/dma-mapping.h> > #include <linux/delay.h> > -#include <asm/cacheflush.h> > +#include <asm/set_memory.h> > #include <sound/core.h> > #include <sound/asoundef.h> > #include <sound/pcm.h> > -- > 2.7.4 > >
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c8256a8..64d6a34 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -53,7 +53,7 @@ #ifdef CONFIG_X86 /* for snoop control */ #include <asm/pgtable.h> -#include <asm/cacheflush.h> +#include <asm/set_memory.h> #include <asm/cpufeature.h> #endif #include <sound/core.h> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 9720a30..6d17b17 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -40,7 +40,9 @@ #include <sound/initval.h> /* for 440MX workaround */ #include <asm/pgtable.h> -#include <asm/cacheflush.h> +#ifdef CONFIG_X86 +#include <asm/set_memory.h> +#endif MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455"); diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index c505b01..664b7fe 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -30,7 +30,7 @@ #include <linux/pm_runtime.h> #include <linux/dma-mapping.h> #include <linux/delay.h> -#include <asm/cacheflush.h> +#include <asm/set_memory.h> #include <sound/core.h> #include <sound/asoundef.h> #include <sound/pcm.h>
set_memory_* functions have moved to set_memory.h. Switch to this explicitly. Signed-off-by: Laura Abbott <labbott@redhat.com> --- v3: Add a few other files caught by 0day bot --- sound/pci/hda/hda_intel.c | 2 +- sound/pci/intel8x0.c | 4 +++- sound/x86/intel_hdmi_audio.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)