tracing, Text Edit Lock - kprobes architecture independent support, nommu fix (505f2b97) · Commits · 戴 / test

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 ("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>

kernel/extable.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,21 @@
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/
		#include <linux/ftrace.h>
		#include <linux/module.h>
		#include <linux/mutex.h>
		#include <linux/init.h>
		#include <linux/ftrace.h>
		#include <asm/uaccess.h>

		#include <asm/sections.h>
		#include <asm/uaccess.h>

		/*
		* mutex protecting text section modification (dynamic code patching).
		* some users need to sleep (allocating memory...) while they hold this lock.
		*
		* NOT exported to modules - patching kernel text is a really delicate matter.
		*/
		DEFINE_MUTEX(text_mutex);

		extern struct exception_table_entry __start___ex_table[];
		extern struct exception_table_entry __stop___ex_table[];

mm/memory.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -101,14 +101,6 @@ int randomize_va_space __read_mostly =
		2;
		#endif

		/*
		* mutex protecting text section modification (dynamic code patching).
		* some users need to sleep (allocating memory...) while they hold this lock.
		*
		* NOT exported to modules - patching kernel text is a really delicate matter.
		*/
		DEFINE_MUTEX(text_mutex);

		static int __init disable_randmaps(char *s)
		{
		randomize_va_space = 0;

Admin message