[Adeos-main] x86: Fix-up for 2.6.26.5+

[Adeos-main] x86: Fix-up for 2.6.26.5+

[Jan Kiszka]

Philippe,

ipipe-2.0-15 does not apply to 2.6.26.5 and later. Hunk below might be
non-trivial to resolve for normal users, so please merge soon
(specifically into Xenomai):

Index: linux-2.6.26-xeno_64/arch/x86/kernel/traps_64.c
===================================================================
--- linux-2.6.26-xeno_64.orig/arch/x86/kernel/traps_64.c
+++ linux-2.6.26-xeno_64/arch/x86/kernel/traps_64.c
@@ -1140,17 +1148,20 @@ asmlinkage void math_state_restore(void)
 		local_irq_disable();
 	}
 
+	local_irq_save_hw_cond(flags);
 	clts();			/* Allow maths ops (or we recurse) */
  	/*
  	 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
  	 */
  	if (unlikely(restore_fpu_checking(&me->thread.xstate->fxsave))) {
  		stts();
+		local_irq_restore_hw_cond(flags);
  		force_sig(SIGSEGV, me);
  		return;
  	}
 	task_thread_info(me)->status |= TS_USEDFPU;
 	me->fpu_counter++;
+	local_irq_restore_hw_cond(flags);
 }
 EXPORT_SYMBOL_GPL(math_state_restore);
 

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux