On Tue, 11 Jul 2000, Christopher C. Chimelis wrote:

> > Has somebody compiled it yet ??

Try this patch.  I haven't gotten a chance to really try it yet, but it
should at least get most of the kernel to build ok.  Seems that they
removed a #define and changed a struct without globally changing the
instances of each :-(

Let me know if this works or not.  I'm sure Alan's already gotten to this
stuff, but I can send it to him anyway if this does work...

C

diff -ruN linux-2.4.0test3/drivers/block/md.c linux-patched/drivers/block/md.c
--- linux-2.4.0test3/drivers/block/md.c Fri Jul  7 18:53:58 2000
+++ linux-patched/drivers/block/md.c    Thu Jul 13 09:33:01 2000
@@ -2908,7 +2908,7 @@
         * many dirty RAID5 blocks.
         */
        current->policy = SCHED_OTHER;
-       current->priority = 40;
+       current->nice = 40;
 //     md_unlock_kernel();
 
        up(thread->sem);
@@ -3336,7 +3336,7 @@
        /*
         * Resync has low priority.
         */
-       current->priority = 1;
+       current->nice = 1;
 
        is_mddev_idle(mddev); /* this also initializes IO event counters */
        for (m = 0; m < SYNC_MARKS; m++) {
@@ -3412,7 +3412,7 @@
                currspeed = 
(j-mddev->resync_mark_cnt)/((jiffies-mddev->resync_mark)/HZ +1) +1;
 
                if (currspeed > sysctl_speed_limit_min) {
-                       current->priority = 1;
+                       current->nice = 1;
 
                        if ((currspeed > sysctl_speed_limit_max) ||
                                        !is_mddev_idle(mddev)) {
@@ -3422,7 +3422,7 @@
                                        goto repeat;
                        }
                } else
-                       current->priority = 40;
+                       current->nice = 40;
        }
        fsync_dev(read_disk);
        printk(KERN_INFO "md: md%d: sync done.\n",mdidx(mddev));
diff -ruN linux-2.4.0test3/kernel/timer.c linux-patched/kernel/timer.c
--- linux-2.4.0test3/kernel/timer.c     Mon Jul 10 17:35:19 2000
+++ linux-patched/kernel/timer.c        Thu Jul 13 09:30:48 2000
@@ -577,7 +577,7 @@
                        p->counter = 0;
                        p->need_resched = 1;
                }
-               if (p->priority < DEF_PRIORITY)
+               if (p->nice < DEF_COUNTER)
                        kstat.cpu_nice += user_tick;
                else
                        kstat.cpu_user += user_tick;

Reply via email to