diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-20 06:05:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-20 06:09:27 -0400 |
commit | 505f2b970b2269ce4cb669b3ff4f6479d379cec2 (patch) | |
tree | 741b9ed4752d852eb8b01dd4b4be765c9f37015e /mm/memory.c | |
parent | 22de89b371a18086162eacd9f8c960299334ab01 (diff) |
tracing, Text Edit Lock - kprobes architecture independent support, nommu fix
Impact: build fix on SH !CONFIG_MMU
Stephen Rothwell reported this linux-next build failure on the SH
architecture:
kernel/built-in.o: In function `disable_all_kprobes':
kernel/kprobes.c:1382: undefined reference to `text_mutex'
[...]
And observed:
| Introduced by commit 4460fdad85becd569f11501ad5b91814814335ff ("tracing,
| Text Edit Lock - kprobes architecture independent support") from the
| tracing tree. text_mutex is defined in mm/memory.c which is only built
| if CONFIG_MMU is defined, which is not true for sh allmodconfig.
Move this lock to kernel/extable.c (which is already home to various
kernel text related routines), which file is always built-in.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
LKML-Reference: <20090320110602.86351a91.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/memory.c b/mm/memory.c index 05fab3bc5b4b..dfc9e4ea4e8b 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -101,14 +101,6 @@ int randomize_va_space __read_mostly = | |||
101 | 2; | 101 | 2; |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | /* | ||
105 | * mutex protecting text section modification (dynamic code patching). | ||
106 | * some users need to sleep (allocating memory...) while they hold this lock. | ||
107 | * | ||
108 | * NOT exported to modules - patching kernel text is a really delicate matter. | ||
109 | */ | ||
110 | DEFINE_MUTEX(text_mutex); | ||
111 | |||
112 | static int __init disable_randmaps(char *s) | 104 | static int __init disable_randmaps(char *s) |
113 | { | 105 | { |
114 | randomize_va_space = 0; | 106 | randomize_va_space = 0; |