From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbXLFCIC (ORCPT ); Wed, 5 Dec 2007 21:08:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754951AbXLFCGF (ORCPT ); Wed, 5 Dec 2007 21:06:05 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:38083 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754932AbXLFCGD (ORCPT ); Wed, 5 Dec 2007 21:06:03 -0500 Message-Id: <20071206020445.732521334@polymtl.ca> References: <20071206020246.417605824@polymtl.ca> User-Agent: quilt/0.46-1 Date: Wed, 05 Dec 2007 21:02:56 -0500 From: Mathieu Desnoyers To: akpm@linux-foundation.org, Ingo Molnar , linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , Andi Kleen , pageexec@freemail.hu, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [patch 10/11] Text Edit Lock - x86_32 standardize debug rodata Content-Disposition: inline; filename=text-edit-lock-i386-standardize-debug-rodata.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Thu, 6 Dec 2007 02:04:50 +0000 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Standardize DEBUG_RODATA, removing special cases for hotplug and kprobes. Signed-off-by: Mathieu Desnoyers CC: Andi Kleen CC: pageexec@freemail.hu CC: Thomas Gleixner CC: Ingo Molnar CC: H. Peter Anvin --- 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