diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 17:07:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-12 17:07:25 +1000 |
| commit | 72f5b542fee805a5c1ac3a874b59b4bc494b1fb6 (patch) | |
| tree | d4a9ff3a111407ed6d145cccb44a7f02963e98fb /arch/s390/include | |
| parent | b3857aacfa35f5097984626733a2d09eb6c3bcb3 (diff) | |
| parent | a33297c95d6bce1713c6f0b3f8bdc8e8395d647f (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/s390/include/asm/set_memory.h (renamed from arch/s390/include/asm/cacheflush.h) | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 7e3481eb2174..45092b12f54f 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -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 diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/set_memory.h index 0499334f9473..46a4db44c47a 100644 --- a/arch/s390/include/asm/cacheflush.h +++ b/arch/s390/include/asm/set_memory.h @@ -1,8 +1,5 @@ -#ifndef _S390_CACHEFLUSH_H -#define _S390_CACHEFLUSH_H - -/* Caches aren't brain-dead on the s390. */ -#include <asm-generic/cacheflush.h> +#ifndef _ASMS390_SET_MEMORY_H +#define _ASMS390_SET_MEMORY_H #define SET_MEMORY_RO 1UL #define SET_MEMORY_RW 2UL @@ -31,4 +28,4 @@ static inline int set_memory_x(unsigned long addr, int numpages) return __set_memory(addr, numpages, SET_MEMORY_X); } -#endif /* _S390_CACHEFLUSH_H */ +#endif |