The patch titled
add __[start|end]_rodata sections to asm-generic/sections.h
has been removed from the -mm tree. Its filename is
add-___rodata-sections-to-asm-generic-sectionsh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: add __[start|end]_rodata sections to asm-generic/sections.h
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Add __start_rodata and __end_rodata to sections.h to avoid extern
declarations. Needed by s390 code (see following patch).
[akpm@xxxxxxxx: update architectures]
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Acked-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/init.c | 9 ++++-----
arch/parisc/mm/init.c | 4 ++--
arch/x86_64/mm/init.c | 7 +++----
include/asm-generic/sections.h | 1 +
4 files changed, 10 insertions(+), 11 deletions(-)
diff -puN arch/i386/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh arch/i386/mm/init.c
--- a/arch/i386/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh
+++ a/arch/i386/mm/init.c
@@ -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.
diff -puN arch/parisc/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh arch/parisc/mm/init.c
--- a/arch/parisc/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh
+++ a/arch/parisc/mm/init.c
@@ -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
diff -puN arch/x86_64/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh arch/x86_64/mm/init.c
--- a/arch/x86_64/mm/init.c~add-___rodata-sections-to-asm-generic-sectionsh
+++ a/arch/x86_64/mm/init.c
@@ -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.
diff -puN include/asm-generic/sections.h~add-___rodata-sections-to-asm-generic-sectionsh include/asm-generic/sections.h
--- a/include/asm-generic/sections.h~add-___rodata-sections-to-asm-generic-sectionsh
+++ a/include/asm-generic/sections.h
@@ -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_ */
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
irq-flags-consolidate-flags-for-request_irq.patch
irq-flags-s390-use-the-new-irqf_-constansts.patch
git-klibc.patch
lockdep-console_init-after-local_irq_enable.patch
lockdep-add-print_ip_sym.patch
lockdep-s390-config_frame_pointer-support.patch
lockdep-stacktrace-subsystem-s390-support.patch
lockdep-irqtrace-subsystem-s390-support.patch
lockdep-s390-turn-validator-off-in-machine-check-handler.patch
lockdep-annotate-qeth-driver.patch
lockdep-special-s390-print_symbol-version.patch
s390-move-var-declarations-behind-ifdef.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
