Make the assembly-level code match the preempt_sched

changes

arch/i386/kernel/entry.S

@@ -238,10 +238,11 @@ ENTRY(resume_kernel)
 	movl SYMBOL_NAME(irq_stat)+local_bh_count CPU_IDX, %ecx
 	addl SYMBOL_NAME(irq_stat)+local_irq_count CPU_IDX, %ecx
 	jnz restore_all
-	incl TI_PRE_COUNT(%ebx)
+	movl $PREEMPT_ACTIVE,TI_PRE_COUNT(%ebx)
 	sti
-	call SYMBOL_NAME(preempt_schedule)
-	jmp ret_from_intr
+	call SYMBOL_NAME(schedule)
+	movl $0,TI_PRE_COUNT(%ebx) 
+	jmp restore_all
 #endif
 
 	# system call handler stub

include/asm-i386/thread_info.h

@@ -47,6 +47,8 @@ struct thread_info {
 
 #endif
 
+#define PREEMPT_ACTIVE		0x4000000
+
 /*
  * macros/functions for gaining access to the thread information structure
  */

include/linux/sched.h

@@ -91,7 +91,6 @@ extern unsigned long nr_running(void);
 #define TASK_UNINTERRUPTIBLE	2
 #define TASK_ZOMBIE		4
 #define TASK_STOPPED		8
-#define PREEMPT_ACTIVE		0x4000000
 
 #define __set_task_state(tsk, state_value)		\
 	do { (tsk)->state = (state_value); } while (0)