tracing: allow to change permissions for text with dynamic ftrace enabled

[net-next-2.6.git] / arch / x86 / mm / pageattr.c

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index b494fc4a986ed313e230a304148b2835814b1473..78d3168b3c6438e663ff78bedcfb37ab726ddd73 100644 (file)
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -279,7 +279,8 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
                   __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
                pgprot_val(forbidden) |= _PAGE_RW;
 
-#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
+#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) && \
+       !defined(CONFIG_DYNAMIC_FTRACE)
        /*
         * Kernel text mappings for the large page aligned .rodata section
         * will be read-only. For the kernel identity mappings covering