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

Commit a581c2a4 authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

[PATCH] add __[start|end]_rodata sections to asm-generic/sections.h 



Add __start_rodata and __end_rodata to sections.h to avoid extern
declarations.  Needed by s390 code (see following patch).

[akpm@osdl.org: update architectures]
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e2c27700

arch/i386/mm/init.c

+4 −5
Original line number Diff line number Diff line
@@ -725,16 +725,15 @@ static int noinline do_test_wp_bit(void) 


#ifdef CONFIG_DEBUG_RODATA



extern char __start_rodata, __end_rodata;

void mark_rodata_ro(void)

{

	unsigned long addr = (unsigned long)&__start_rodata;

	unsigned long addr = (unsigned long)__start_rodata;



	for (; addr < (unsigned long)&__end_rodata; addr += PAGE_SIZE)

	for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE)

		change_page_attr(virt_to_page(addr), 1, PAGE_KERNEL_RO);



	printk ("Write protecting the kernel read-only data: %luk\n",

			(unsigned long)(&__end_rodata - &__start_rodata) >> 10);

	printk("Write protecting the kernel read-only data: %uk\n",

			(__end_rodata - __start_rodata) >> 10);



	/*

	 * change_page_attr() requires a global_flush_tlb() call after it.

arch/parisc/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/tlb.h>

#include <asm/pdc_chassis.h>

#include <asm/mmzone.h>

#include <asm/sections.h>



DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
@@ -417,11 +418,10 @@ void free_initmem(void) 
#ifdef CONFIG_DEBUG_RODATA

void mark_rodata_ro(void)

{

	extern char __start_rodata, __end_rodata;

	/* rodata memory was already mapped with KERNEL_RO access rights by

           pagetable_init() and map_pages(). No need to do additional stuff here */

	printk (KERN_INFO "Write protecting the kernel read-only data: %luk\n",

		(unsigned long)(&__end_rodata - &__start_rodata) >> 10);

		(unsigned long)(__end_rodata - __start_rodata) >> 10);

}

#endif

arch/x86_64/mm/init.c

+3 −4
Original line number Diff line number Diff line
@@ -678,16 +678,15 @@ void free_initmem(void) 


#ifdef CONFIG_DEBUG_RODATA



extern char __start_rodata, __end_rodata;

void mark_rodata_ro(void)

{

	unsigned long addr = (unsigned long)&__start_rodata;

	unsigned long addr = (unsigned long)__start_rodata;



	for (; addr < (unsigned long)&__end_rodata; addr += PAGE_SIZE)

	for (; addr < (unsigned long)__end_rodata; addr += PAGE_SIZE)

		change_page_attr_addr(addr, 1, PAGE_KERNEL_RO);



	printk ("Write protecting the kernel read-only data: %luk\n",

			(&__end_rodata - &__start_rodata) >> 10);

			(__end_rodata - __start_rodata) >> 10);



	/*

	 * change_page_attr_addr() requires a global_flush_tlb() call after it.

include/asm-generic/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ extern char _end[]; 
extern char __per_cpu_start[], __per_cpu_end[];

extern char __kprobes_text_start[], __kprobes_text_end[];

extern char __initdata_begin[], __initdata_end[];

extern char __start_rodata[], __end_rodata[];



#endif /* _ASM_GENERIC_SECTIONS_H_ */