diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/frv/kernel/break.S | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/frv/kernel/break.S')
| -rw-r--r-- | arch/frv/kernel/break.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/kernel/break.S b/arch/frv/kernel/break.S index bd0bdf908d93..cbb6958a3147 100644 --- a/arch/frv/kernel/break.S +++ b/arch/frv/kernel/break.S | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | # | 21 | # |
| 22 | # the break handler has its own stack | 22 | # the break handler has its own stack |
| 23 | # | 23 | # |
| 24 | .section .bss.stack | 24 | .section .bss..stack |
| 25 | .globl __break_user_context | 25 | .globl __break_user_context |
| 26 | .balign THREAD_SIZE | 26 | .balign THREAD_SIZE |
| 27 | __break_stack: | 27 | __break_stack: |
| @@ -63,7 +63,7 @@ __break_trace_through_exceptions: | |||
| 63 | # entry point for Break Exceptions/Interrupts | 63 | # entry point for Break Exceptions/Interrupts |
| 64 | # | 64 | # |
| 65 | ############################################################################### | 65 | ############################################################################### |
| 66 | .section .text.break | 66 | .section .text..break |
| 67 | .balign 4 | 67 | .balign 4 |
| 68 | .globl __entry_break | 68 | .globl __entry_break |
| 69 | __entry_break: | 69 | __entry_break: |