lkml.org 
[lkml]   [2008]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 13/26] Text Edit Lock - x86_64 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_64.c | 23 +++++------------------
    1 file changed, 5 insertions(+), 18 deletions(-)

    Index: linux-2.6-lttng.mm/arch/x86/mm/init_64.c
    ===================================================================
    --- linux-2.6-lttng.mm.orig/arch/x86/mm/init_64.c 2008-01-24 14:10:42.000000000 -0500
    +++ linux-2.6-lttng.mm/arch/x86/mm/init_64.c 2008-01-24 14:28:40.000000000 -0500
    @@ -714,25 +714,11 @@ void free_initmem(void)

    void mark_rodata_ro(void)
    {
    - unsigned long start = (unsigned long)_stext, end;
    + unsigned long start = PFN_ALIGN(_stext);
    + unsigned long end = PFN_ALIGN(__end_rodata);

    -#ifdef CONFIG_HOTPLUG_CPU
    - /* It must still be possible to apply SMP alternatives. */
    - if (num_possible_cpus() > 1)
    - start = (unsigned long)_etext;
    -#endif
    -
    -#ifdef CONFIG_KPROBES
    - start = (unsigned long)__start_rodata;
    -#endif
    -
    - end = (unsigned long)__end_rodata;
    - start = (start + PAGE_SIZE - 1) & PAGE_MASK;
    - end &= PAGE_MASK;
    - if (end <= start)
    - return;
    -
    - change_page_attr_addr(start, (end - start) >> PAGE_SHIFT, PAGE_KERNEL_RO);
    + change_page_attr_addr(start, (end - start) >> PAGE_SHIFT,
    + PAGE_KERNEL_RO);

    printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
    (end - start) >> 10);
    @@ -745,6 +731,7 @@ void mark_rodata_ro(void)
    */
    global_flush_tlb();
    }
    +
    #endif

    #ifdef CONFIG_BLK_DEV_INITRD
    --
    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: 2008-01-24 21:43    [W:0.020 / U:2.888 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site