diff options
-rw-r--r-- | kernel/extable.c | 14 | ||||
-rw-r--r-- | mm/memory.c | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/kernel/extable.c b/kernel/extable.c index 0df6253730be..25d39b0c3a1b 100644 --- a/kernel/extable.c +++ b/kernel/extable.c | |||
@@ -15,11 +15,21 @@ | |||
15 | along with this program; if not, write to the Free Software | 15 | along with this program; if not, write to the Free Software |
16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | #include <linux/ftrace.h> | ||
18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/mutex.h> | ||
19 | #include <linux/init.h> | 21 | #include <linux/init.h> |
20 | #include <linux/ftrace.h> | 22 | |
21 | #include <asm/uaccess.h> | ||
22 | #include <asm/sections.h> | 23 | #include <asm/sections.h> |
24 | #include <asm/uaccess.h> | ||
25 | |||
26 | /* | ||
27 | * mutex protecting text section modification (dynamic code patching). | ||
28 | * some users need to sleep (allocating memory...) while they hold this lock. | ||
29 | * | ||
30 | * NOT exported to modules - patching kernel text is a really delicate matter. | ||
31 | */ | ||
32 | DEFINE_MUTEX(text_mutex); | ||
23 | 33 | ||
24 | extern struct exception_table_entry __start___ex_table[]; | 34 | extern struct exception_table_entry __start___ex_table[]; |
25 | extern struct exception_table_entry __stop___ex_table[]; | 35 | extern struct exception_table_entry __stop___ex_table[]; |
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; |