Import 2.0.40pre3

diff --git a/Makefile b/Makefile
index 2d2827aff531a243c22592406cbbc694d5009d08..e2ac0e4e4a35fc6aa95146b0b9f71038587e2f9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 0
 SUBLEVEL = 40
-EXTRAVERSION =-pre1
+EXTRAVERSION =-pre3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 898e4e1524fb796081c9d92afd1a9d3d93ac2aea..4278219ef12a29d4b44acfa9a00c28849e67002f 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -2738,6 +2738,10 @@ static int try_to_identify (ide_drive_t *drive, byte cmd)
        } 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 --git a/kernel/sched.c b/kernel/sched.c
index bbe1e9e27d6c1b663ddce1fe89ef3c1444f6adce..92f7e6880efdbd0b7d3ea97530dea0277551e0e7 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -241,15 +241,15 @@ static inline int goodness(struct task_struct * p, struct task_struct * prev, in
 {
        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
 
        /*