Commit e6ccbff0 authored by Laura Abbott's avatar Laura Abbott Committed by Linus Torvalds

treewide: decouple cacheflush.h and set_memory.h

Now that all call sites, completely decouple cacheflush.h and
set_memory.h

[sfr@canb.auug.org.au: kprobes/x86: merge fix for set_memory.h decoupling]
  Link: http://lkml.kernel.org/r/20170418180903.10300fd3@canb.auug.org.au
Link: http://lkml.kernel.org/r/1488920133-27229-17-git-send-email-labbott@redhat.comSigned-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 880d5a36
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <asm/shmparam.h> #include <asm/shmparam.h>
#include <asm/cachetype.h> #include <asm/cachetype.h>
#include <asm/outercache.h> #include <asm/outercache.h>
#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define __ASM_CACHEFLUSH_H #define __ASM_CACHEFLUSH_H
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/set_memory.h>
/* /*
* This flag is used to indicate that the page pointed to by a pte is clean * This flag is used to indicate that the page pointed to by a pte is clean
......
generic-y += asm-offsets.h generic-y += asm-offsets.h
generic-y += cacheflush.h
generic-y += clkdev.h generic-y += clkdev.h
generic-y += dma-contiguous.h generic-y += dma-contiguous.h
generic-y += div64.h generic-y += div64.h
......
#ifndef _S390_CACHEFLUSH_H
#define _S390_CACHEFLUSH_H
/* Caches aren't brain-dead on the s390. */
#include <asm-generic/cacheflush.h>
#include <asm/set_memory.h>
#endif /* _S390_CACHEFLUSH_H */
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
/* Caches aren't brain-dead on the intel. */ /* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h> #include <asm-generic/cacheflush.h>
#include <asm/special_insns.h> #include <asm/special_insns.h>
#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size); void clflush_cache_range(void *addr, unsigned int size);
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/debugreg.h> #include <asm/debugreg.h>
#include <asm/set_memory.h>
#include "common.h" #include "common.h"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/debugreg.h> #include <asm/debugreg.h>
#include <asm/set_memory.h>
#include "common.h" #include "common.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment