From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Text Edit Lock - i386 Fix endif CONFIG_DEBUG_RODATA
Date: Sat, 14 Jul 2007 19:31:08 -0400 [thread overview]
Message-ID: <20070714233108.GI18674@Krystal> (raw)
In-Reply-To: <20070714012412.380213021@polymtl.ca>
Text Edit Lock - i386 fix endif CONFIG_DEBUG_RODATA
The #endif would also include kernel_text_unmark().
The replacement empty functions should be static inline.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---
arch/i386/mm/init.c | 2 +-
include/asm-i386/cacheflush.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
Index: linux-2.6-lttng/arch/i386/mm/init.c
===================================================================
--- linux-2.6-lttng.orig/arch/i386/mm/init.c 2007-07-14 19:24:27.000000000 -0400
+++ linux-2.6-lttng/arch/i386/mm/init.c 2007-07-14 19:24:27.000000000 -0400
@@ -845,7 +845,6 @@ void __kprobes kernel_text_mark_rw(unsig
}
}
EXPORT_SYMBOL_GPL(kernel_text_mark_rw);
-#endif
void __kprobes kernel_text_unmark(unsigned long address, size_t len)
{
@@ -862,6 +861,7 @@ void __kprobes kernel_text_unmark(unsign
}
}
EXPORT_SYMBOL_GPL(kernel_text_unmark);
+#endif
void free_init_pages(char *what, unsigned long begin, unsigned long end)
{
Index: linux-2.6-lttng/include/asm-i386/cacheflush.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-i386/cacheflush.h 2007-07-14 19:24:36.000000000 -0400
+++ linux-2.6-lttng/include/asm-i386/cacheflush.h 2007-07-14 19:25:04.000000000 -0400
@@ -34,15 +34,13 @@ void kernel_map_pages(struct page *page,
#ifdef CONFIG_DEBUG_RODATA
void mark_rodata_ro(void);
-#endif
-#if defined(CONFIG_DEBUG_RODATA)
/* mark kernel text pages writable */
extern void kernel_text_mark_rw(unsigned long address, size_t len);
extern void kernel_text_unmark(unsigned long address, size_t len);
#else
-void kernel_text_mark_rw(unsigned long address, size_t len) { }
-void kernel_text_unmark(unsigned long address, size_t len) { }
+static inline void kernel_text_mark_rw(unsigned long address, size_t len) { }
+static inline void kernel_text_unmark(unsigned long address, size_t len) { }
#endif
#endif /* _I386_CACHEFLUSH_H */
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2007-07-14 23:31 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-14 1:21 [patch 0/8] Text Edit Lock Mathieu Desnoyers
2007-07-14 1:21 ` [patch 1/8] Kprobes - do not use kprobes mutex in arch code Mathieu Desnoyers
2007-07-14 10:49 ` Christoph Hellwig
2007-07-14 19:20 ` Mathieu Desnoyers
2007-07-16 10:27 ` Ananth N Mavinakayanahalli
2007-07-16 15:12 ` Mathieu Desnoyers
2007-07-14 19:30 ` Mathieu Desnoyers
2007-07-14 19:51 ` [PATCH] Kprobes - use a mutex to protect the instruction pages list Mathieu Desnoyers
2007-07-17 5:38 ` Ananth N Mavinakayanahalli
2007-07-14 19:52 ` [PATCH] Kprobes - Declare kprobe_mutex static Mathieu Desnoyers
2007-07-17 5:39 ` Ananth N Mavinakayanahalli
2007-07-17 5:38 ` [patch 1/8] Kprobes - do not use kprobes mutex in arch code Ananth N Mavinakayanahalli
2007-07-14 1:21 ` [patch 2/8] Text Edit Lock - Architecture Independent Code Mathieu Desnoyers
2007-07-14 22:55 ` [PATCH] Immediate Values - Architecture Independent Code - Fixes following HCH comments Mathieu Desnoyers
2007-07-14 22:57 ` (drop : wrong email thread) " Mathieu Desnoyers
2007-07-15 1:28 ` [PATCH] Text Edit Lock - Architecture Independent Code - kerneldoc Mathieu Desnoyers
2007-07-15 9:04 ` Christoph Hellwig
2007-07-15 23:30 ` Mathieu Desnoyers
2007-07-15 23:35 ` [PATCH] Text Edit Lock - Architecture Independent Code for Implementation Mathieu Desnoyers
2007-07-14 1:21 ` [patch 3/8] Text Edit Lock - i386 Mathieu Desnoyers
2007-07-14 16:18 ` Christoph Hellwig
2007-07-14 20:08 ` [PATCH] Text Edit Lock - i386 Use kernel_text_is_ro Mathieu Desnoyers
2007-07-14 23:31 ` Mathieu Desnoyers [this message]
2007-07-15 1:29 ` [PATCH] Text Edit Lock - i386 kerneldoc Mathieu Desnoyers
2007-07-15 23:30 ` Mathieu Desnoyers
2007-07-15 23:36 ` [PATCH] Text Edit Lock - i386 kerneldoc implementation Mathieu Desnoyers
2007-07-14 1:21 ` [patch 4/8] Text Edit Lock - x86_64 Mathieu Desnoyers
2007-07-14 20:16 ` [PATCH] Text Edit Lock - x86_64 Use kernel_tex_is_ro Mathieu Desnoyers
2007-07-14 23:32 ` [PATCH] Text Edit Lock - x86_64 Fix !CONFIG_DEBUG_RODATA Mathieu Desnoyers
2007-07-15 1:30 ` [PATCH] Text Edit Lock - x86_64 kerneldoc Mathieu Desnoyers
2007-07-15 23:30 ` Mathieu Desnoyers
2007-07-15 23:38 ` [PATCH] Text Edit Lock - x86_64 kerneldoc implementation Mathieu Desnoyers
2007-07-14 1:21 ` [patch 5/8] Text Edit Lock - Alternative code for i386 and x86_64 Mathieu Desnoyers
2007-07-14 1:21 ` [patch 6/8] Text Edit Lock - Kprobes architecture independent support Mathieu Desnoyers
2007-07-14 19:56 ` [PATCH] Kprobes - no kprobes_mutex needed around arch_remove_kprobe calls Mathieu Desnoyers
2007-07-14 1:21 ` [patch 7/8] Text Edit Lock - kprobes i386 Mathieu Desnoyers
2007-07-14 1:21 ` [patch 8/8] Text Edit Lock - kprobes x86_64 Mathieu Desnoyers
2007-07-14 10:50 ` [patch 0/8] Text Edit Lock Christoph Hellwig
2007-07-14 15:21 ` Mathieu Desnoyers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070714233108.GI18674@Krystal \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox