lkml.org 
[lkml]   [2007]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 10/24] Text Edit Lock - x86_32 standardize debug rodata
    Standardize DEBUG_RODATA, removing special cases for hotplug and kprobes.

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    CC: Andi Kleen <andi@firstfloor.org>
    CC: pageexec@freemail.hu
    CC: Thomas Gleixner <tglx@linutronix.de>
    CC: Ingo Molnar <mingo@redhat.com>
    CC: H. Peter Anvin <hpa@zytor.com>
    ---
    arch/x86/mm/init_32.c | 20 +++++++-------------
    1 file changed, 7 insertions(+), 13 deletions(-)

    Index: linux-2.6-lttng/arch/x86/mm/init_32.c
    ===================================================================
    --- linux-2.6-lttng.orig/arch/x86/mm/init_32.c 2007-11-13 09:25:29.000000000 -0500
    +++ linux-2.6-lttng/arch/x86/mm/init_32.c 2007-11-13 09:45:48.000000000 -0500
    @@ -784,28 +784,21 @@ static int noinline do_test_wp_bit(void)
    }

    #ifdef CONFIG_DEBUG_RODATA
    -
    void mark_rodata_ro(void)
    {
    unsigned long start = PFN_ALIGN(_text);
    unsigned long size = PFN_ALIGN(_etext) - start;

    -#ifndef CONFIG_KPROBES
    -#ifdef CONFIG_HOTPLUG_CPU
    - /* It must still be possible to apply SMP alternatives. */
    - if (num_possible_cpus() <= 1)
    -#endif
    - {
    - change_page_attr(virt_to_page(start),
    - size >> PAGE_SHIFT, PAGE_KERNEL_RX);
    - printk("Write protecting the kernel text: %luk\n", size >> 10);
    - }
    -#endif
    + change_page_attr(virt_to_page(start),
    + size >> PAGE_SHIFT, PAGE_KERNEL_RX);
    + printk(KERN_INFO "Write protecting the kernel text: %luk\n",
    + size >> 10);
    +
    start += size;
    size = (unsigned long)__end_rodata - start;
    change_page_attr(virt_to_page(start),
    size >> PAGE_SHIFT, PAGE_KERNEL_RO);
    - printk("Write protecting the kernel read-only data: %luk\n",
    + printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
    size >> 10);

    /*
    @@ -816,6 +809,7 @@ void mark_rodata_ro(void)
    */
    global_flush_tlb();
    }
    +
    #endif

    void free_init_pages(char *what, unsigned long begin, unsigned long end)
    --
    Mathieu Desnoyers
    Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
    OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68


    \
     
     \ /
      Last update: 2007-12-21 03:11    [W:0.021 / U:32.148 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site