## Automatically generated incremental diff
## From:   linux-2.0.40-pre2
## To:     linux-2.0.40-pre3
## Robot:  $Id: make-incremental-diff,v 1.9 2001/12/10 00:06:56 hpa Exp $

diff -urN linux-2.0.40-pre2/Makefile linux/Makefile
--- linux-2.0.40-pre2/Makefile	Sun Dec  9 16:08:19 2001
+++ linux/Makefile	Sun Dec  9 16:08:19 2001
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 0
 SUBLEVEL = 40
-EXTRAVERSION =-pre1
+EXTRAVERSION =-pre3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.0.40-pre2/drivers/block/ide.c linux/drivers/block/ide.c
--- linux-2.0.40-pre2/drivers/block/ide.c	Tue Jan  9 13:29:20 2001
+++ linux/drivers/block/ide.c	Sun Dec  9 16:08:19 2001
@@ -2738,6 +2738,10 @@
 	} else
 		hd_status = IDE_ALTSTATUS_REG;	/* use non-intrusive polling */
 
+	/* set features register for atapi identify command */
+	if ((cmd == WIN_PIDENTIFY))
+		OUT_BYTE(0,IDE_FEATURE_REG); /* disable dma & overlap mode */
+
 #if CONFIG_BLK_DEV_PROMISE
 	if (IS_PROMISE_DRIVE) {
 		if (promise_cmd(drive,PROMISE_IDENTIFY)) {
diff -urN linux-2.0.40-pre2/kernel/sched.c linux/kernel/sched.c
--- linux-2.0.40-pre2/kernel/sched.c	Sun Dec  9 16:08:19 2001
+++ linux/kernel/sched.c	Sun Dec  9 16:08:20 2001
@@ -241,15 +241,15 @@
 {
 	int weight;
 
-#ifdef __SMP__	
+#ifdef __SMP__
 	/* We are not permitted to run a task someone else is running */
 	if (p->processor != NO_PROC_ID)
 		return -1000;
-#ifdef PAST_2_0		
+#ifdef PAST_2_0
 	/* This process is locked to a processor group */
-	if (p->processor_mask && !(p->processor_mask & (1<<this_cpu))
+	if (p->processor_mask && !(p->processor_mask & (1<<this_cpu)))
 		return -1000;
-#endif		
+#endif
 #endif
 
 	/*