Skip to content

L
linux
Commit 4fbb4a71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://lia64.bkbits.net/to-linus-2.5 

into home.osdl.org:/home/torvalds/v2.5/linux
parents 4776d260 dce893b6
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
arch/ia64/ia32/ia32_entry.S
View file @ 4fbb4a71
...@@ -90,7 +90,6 @@ END(sys32_sigsuspend) ...@@ -90,7 +90,6 @@ END(sys32_sigsuspend)
GLOBAL_ENTRY(ia32_ret_from_clone) GLOBAL_ENTRY(ia32_ret_from_clone)
PT_REGS_UNWIND_INFO(0) PT_REGS_UNWIND_INFO(0)
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
{ /* { /*
* Some versions of gas generate bad unwind info if the first instruction of a * Some versions of gas generate bad unwind info if the first instruction of a
* procedure doesn't go into the first slot of a bundle. This is a workaround. * procedure doesn't go into the first slot of a bundle. This is a workaround.
...@@ -105,7 +104,6 @@ GLOBAL_ENTRY(ia32_ret_from_clone) ...@@ -105,7 +104,6 @@ GLOBAL_ENTRY(ia32_ret_from_clone)
br.call.sptk.many rp=ia64_invoke_schedule_tail br.call.sptk.many rp=ia64_invoke_schedule_tail
} }
.ret1: .ret1:
#endif
adds r2=TI_FLAGS+IA64_TASK_SIZE,r13 adds r2=TI_FLAGS+IA64_TASK_SIZE,r13
;; ;;
ld4 r2=[r2] ld4 r2=[r2]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7