Commit aefdd438 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Russell King
Browse files

ARM: 9072/1: mm: remove set_kernel_text_r[ow]() 



After commit 5a735583 ("arm/ftrace: Use __patch_text()"), the last
and only user of these functions has gone, remove them.

Signed-off-by: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 32e9a0d5

arch/arm/include/asm/set_memory.h

+0 −8
Original line number Diff line number Diff line
@@ -18,12 +18,4 @@ 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/arm/mm/init.c

+0 −21
Original line number Diff line number Diff line
@@ -487,33 +487,12 @@ static int __mark_rodata_ro(void *unused) 
	return 0;

}



static int kernel_set_to_readonly __read_mostly;



void mark_rodata_ro(void)

{

	kernel_set_to_readonly = 1;

	stop_machine(__mark_rodata_ro, NULL, NULL);

	debug_checkwx();

}



void set_kernel_text_rw(void)

{

	if (!kernel_set_to_readonly)

		return;



	set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), false,

				current->active_mm);

}



void set_kernel_text_ro(void)

{

	if (!kernel_set_to_readonly)

		return;



	set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), true,

				current->active_mm);

}



#else

static inline void fix_kernmem_perms(void) { }

#endif /* CONFIG_STRICT_KERNEL_RWX */