[tip:perf/urgent] jump_label: Fix unaligned traps on sparc.

[tip-bot for David Miller]

Commit-ID:  f0daed0242d514033b9ecca9187108d3c4e281a5
Gitweb:     http://git.kernel.org/tip/f0daed0242d514033b9ecca9187108d3c4e281a5
Author:     David Miller <davem@xxxxxxxxxxxxx>
AuthorDate: Sat, 23 Oct 2010 11:06:24 -0700
Committer:  Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Fri, 29 Oct 2010 12:57:06 -0400

jump_label: Fix unaligned traps on sparc.

The vmlinux.lds.h knobs to emit the __jump_table section in the main
kernel image takes care to align the section, but this doesn't help
for the __jump_table section that gets emitted into modules.

Fix the resulting lack of section alignment by explicitly specifying
it in the assembler.

Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
LKML-Reference: <20101023.110624.226758370.davem@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
 arch/sparc/include/asm/jump_label.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
index 62e66d7..d95cf44 100644
--- a/arch/sparc/include/asm/jump_label.h
+++ b/arch/sparc/include/asm/jump_label.h
@@ -14,6 +14,7 @@
 			 "nop\n\t"				\
 			 "nop\n\t"				\
 			 ".pushsection __jump_table,  \"a\"\n\t"\
+			 ".align 4\n\t"				\
 			 ".word 1b, %l[" #label "], %c0\n\t"	\
 			 ".popsection \n\t"			\
 			 : :  "i" (key) :  : label);\
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/