Skip to content

Commit

Permalink
ARM: 6068/1: Fix build break with KPROBES enabled
Browse files Browse the repository at this point in the history
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 4260415

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>
  • Loading branch information
Santosh Shilimkar authored and Russell King committed May 1, 2010
1 parent be1066b commit 124efc2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/kernel/entry-armv.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 124efc2

Please sign in to comment.