diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 07:54:08 -0400 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /arch/sparc/kernel/etrap.S | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'arch/sparc/kernel/etrap.S')
| -rw-r--r-- | arch/sparc/kernel/etrap.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/etrap.S b/arch/sparc/kernel/etrap.S index f37d961d67a6..e806fcdc46db 100644 --- a/arch/sparc/kernel/etrap.S +++ b/arch/sparc/kernel/etrap.S | |||
| @@ -228,7 +228,6 @@ tsetup_mmu_patchme: | |||
| 228 | */ | 228 | */ |
| 229 | #define glob_tmp g1 | 229 | #define glob_tmp g1 |
| 230 | 230 | ||
| 231 | .globl tsetup_sun4c_stackchk | ||
| 232 | tsetup_sun4c_stackchk: | 231 | tsetup_sun4c_stackchk: |
| 233 | /* Done by caller: andcc %sp, 0x7, %g0 */ | 232 | /* Done by caller: andcc %sp, 0x7, %g0 */ |
| 234 | bne trap_setup_user_stack_is_bolixed | 233 | bne trap_setup_user_stack_is_bolixed |