diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:06:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:06:56 -0500 |
| commit | 42bb1899221d362bee5480e3abc9b05243bf38fb (patch) | |
| tree | 2887b9c6e3b1a25836447a825ae466a9b69f43a5 /arch/sparc64/lib/NGbzero.S | |
| parent | cec03afcb62fbbb0eaf943f6349ade61b89d7d40 (diff) | |
| parent | 4787083fcce866e275bedeb87cd6dfba34c84253 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix inconsistent .section usage in lib/
[SPARC/SPARC64]: Fix usage of .section .sched.text in assembler code.
Diffstat (limited to 'arch/sparc64/lib/NGbzero.S')
| -rw-r--r-- | arch/sparc64/lib/NGbzero.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/lib/NGbzero.S b/arch/sparc64/lib/NGbzero.S index f10e4529ee37..814d5f7a45e1 100644 --- a/arch/sparc64/lib/NGbzero.S +++ b/arch/sparc64/lib/NGbzero.S | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | .align 4; \ | 10 | .align 4; \ |
| 11 | 99: retl; \ | 11 | 99: retl; \ |
| 12 | mov %o1, %o0; \ | 12 | mov %o1, %o0; \ |
| 13 | .section __ex_table; \ | 13 | .section __ex_table,"a";\ |
| 14 | .align 4; \ | 14 | .align 4; \ |
| 15 | .word 98b, 99b; \ | 15 | .word 98b, 99b; \ |
| 16 | .text; \ | 16 | .text; \ |