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

Commit dfabba9c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'lsk/v4.4/topic/ro-vdso' into linux-linaro-lsk-v4.4

parents 34f6d2c9 a1bd41f7

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -3409,6 +3409,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	ro		[KNL] Mount root device read-only on boot



	rodata=		[KNL]

		on	Mark read-only kernel memory as read-only (default).

		off	Leave read-only kernel memory writable for debugging.



	root=		[KNL] Root filesystem

			See name_to_dev_t comment in init/do_mounts.c.

arch/arm/include/asm/cacheflush.h

+0 −1
Original line number Diff line number Diff line
@@ -491,7 +491,6 @@ static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; } 
#endif



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

void set_kernel_text_rw(void);

void set_kernel_text_ro(void);

#else

arch/arm/vdso/vdso.S

+1 −2
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 
#include <linux/const.h>

#include <asm/page.h>



	__PAGE_ALIGNED_DATA



	.globl vdso_start, vdso_end

	.section .data..ro_after_init

	.balign PAGE_SIZE

vdso_start:

	.incbin "arch/arm/vdso/vdso.so"

arch/arm64/include/asm/cacheflush.h

+0 −4
Original line number Diff line number Diff line
@@ -155,8 +155,4 @@ 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);



#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void);

#endif



#endif

arch/parisc/include/asm/cache.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 


#define __read_mostly __attribute__((__section__(".data..read_mostly")))



/* Read-only memory is marked before mark_rodata_ro() is called. */

#define __ro_after_init	__read_mostly



void parisc_cache_init(void);	/* initializes cache-flushing */

void disable_sr_hashing_asm(int); /* low level support for above */

void disable_sr_hashing(void);   /* turns off space register hashing */