Commit 124efc27 authored Apr 30, 2010 by Santosh Shilimkar Committed by Russell King May 01, 2010

ARM: 6068/1: Fix build break with KPROBES enabled



With CONFIG_KPROBES enabled two section are getting created which
leads to below build break.

LOG:
 AS      arch/arm/kernel/entry-armv.o
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:431: Error: symbol ret_from_exception is in a different section
arch/arm/kernel/entry-armv.S:490: Error: symbol ret_from_exception is in a different section
arch/arm/kernel/entry-armv.S:491: Error: symbol __und_usr_unknown is in a different section

This was introduced by commit 4260415f

Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent be1066bb

arch/arm/kernel/entry-armv.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -676,10 +676,10 @@ do_fpe:
		* lr = unrecognised FP instruction return address
		*/

		.data
		.pushsection .data
		ENTRY(fp_enter)
		.word no_fp
		.text
		.popsection

		ENTRY(no_fp)
		mov pc, lr