Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 299878ba authored by Laura Abbott's avatar Laura Abbott Committed by Linus Torvalds
Browse files

treewide: move set_memory_* functions away from cacheflush.h 

Patch series "set_memory_* functions header refactor", v3.

The set_memory_* APIs came out of a desire to have a better way to
change memory attributes.  Many of these attributes were linked to cache
functionality so the prototypes were put in cacheflush.h.  These days,
the APIs have grown and have a much wider use than just cache APIs.  To
support this growth, split off set_memory_* and friends into a separate
header file to avoid growing cacheflush.h for APIs that have nothing to
do with caches.

Link: http://lkml.kernel.org/r/1488920133-27229-2-git-send-email-labbott@redhat.com


Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
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 8ac1ed79

arch/arm/include/asm/cacheflush.h

+1 −20
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#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)
@@ -478,26 +479,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) 
	: : : "r0","r1","r2","r3","r4","r5","r6","r7", \

	      "r9","r10","lr","memory" )



#ifdef CONFIG_MMU

int set_memory_ro(unsigned long addr, int numpages);

int set_memory_rw(unsigned long addr, int numpages);

int set_memory_x(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);

#else

static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }

#endif



#ifdef CONFIG_STRICT_KERNEL_RWX

void set_kernel_text_rw(void);

void set_kernel_text_ro(void);

#else

static inline void set_kernel_text_rw(void) { }

static inline void set_kernel_text_ro(void) { }

#endif



void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,

			     void *kaddr, unsigned long len);

arch/arm/include/asm/set_memory.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 1999-2002 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _ASMARM_SET_MEMORY_H

#define _ASMARM_SET_MEMORY_H



#ifdef CONFIG_MMU

int set_memory_ro(unsigned long addr, int numpages);

int set_memory_rw(unsigned long addr, int numpages);

int set_memory_x(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);

#else

static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }

static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }

#endif



#ifdef CONFIG_STRICT_KERNEL_RWX

void set_kernel_text_rw(void);

void set_kernel_text_ro(void);

#else

static inline void set_kernel_text_rw(void) { }

static inline void set_kernel_text_ro(void) { }

#endif



#endif

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ generic-y += rwsem.h 
generic-y += segment.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += set_memory.h

generic-y += shmbuf.h

generic-y += simd.h

generic-y += sizes.h

arch/arm64/include/asm/cacheflush.h

+1 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#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
@@ -150,10 +151,6 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end) 
{

}



int set_memory_ro(unsigned long addr, int numpages);

int set_memory_rw(unsigned long addr, int numpages);

int set_memory_x(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);

int set_memory_valid(unsigned long addr, unsigned long size, int enable);



#endif

arch/s390/include/asm/cacheflush.h

+1 −27
Original line number Diff line number Diff line
@@ -3,32 +3,6 @@ 


/* Caches aren't brain-dead on the s390. */

#include <asm-generic/cacheflush.h>



#define SET_MEMORY_RO	1UL

#define SET_MEMORY_RW	2UL

#define SET_MEMORY_NX	4UL

#define SET_MEMORY_X	8UL



int __set_memory(unsigned long addr, int numpages, unsigned long flags);



static inline int set_memory_ro(unsigned long addr, int numpages)

{

	return __set_memory(addr, numpages, SET_MEMORY_RO);

}



static inline int set_memory_rw(unsigned long addr, int numpages)

{

	return __set_memory(addr, numpages, SET_MEMORY_RW);

}



static inline int set_memory_nx(unsigned long addr, int numpages)

{

	return __set_memory(addr, numpages, SET_MEMORY_NX);

}



static inline int set_memory_x(unsigned long addr, int numpages)

{

	return __set_memory(addr, numpages, SET_MEMORY_X);

}

#include <asm/set_memory.h>



#endif /* _S390_CACHEFLUSH_H */