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

into home.osdl.org:/home/torvalds/v2.5/linux

arch/ia64/ia32/ia32_entry.S

@@ -90,7 +90,6 @@ END(sys32_sigsuspend)
 
 GLOBAL_ENTRY(ia32_ret_from_clone)
 	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
 	 * 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)
 	br.call.sptk.many rp=ia64_invoke_schedule_tail
 }
 .ret1:
-#endif
 	adds r2=TI_FLAGS+IA64_TASK_SIZE,r13
 	;;
 	ld4 r2=[r2]