leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: decouple cacheflush.h and set_memory.h

Browse Source 
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.com
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Laura Abbott 2017-05-08 15:58:47 -07:00 committed by Linus Torvalds
parent 880d5a36ef
commit e6ccbff0e9
7 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/cacheflush.h
View File

@ -16,7 +16,6 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)

1
arch/arm64/include/asm/cacheflush.h
View File

@ -20,7 +20,6 @@
#define __ASM_CACHEFLUSH_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

1
arch/s390/include/asm/Kbuild
View File

@ -1,4 +1,5 @@
generic-y += asm-offsets.h
generic-y += cacheflush.h
generic-y += clkdev.h
generic-y += dma-contiguous.h
generic-y += div64.h

8
arch/s390/include/asm/cacheflush.h
View File

@ -1,8 +0,0 @@
#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 */

1
arch/x86/include/asm/cacheflush.h
View File

@ -4,7 +4,6 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);

1
arch/x86/kernel/kprobes/core.c
View File

@ -61,6 +61,7 @@
#include <asm/alternative.h>
#include <asm/insn.h>
#include <asm/debugreg.h>
#include <asm/set_memory.h>
#include "common.h"

1
arch/x86/kernel/kprobes/opt.c
View File

@ -37,6 +37,7 @@
#include <asm/alternative.h>
#include <asm/insn.h>
#include <asm/debugreg.h>
#include <asm/set_memory.h>
#include "common.h"