--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: kernel-patch-benh: weird patch behavior when combined with lowlatency patch
- From: Matijs van Zuijlen <Matijs.van.Zuijlen@xs4all.nl>
- Date: Sat, 25 Oct 2003 18:21:24 +0200
- Message-id: <E1ADRAL-0002H6-00@pomme>
Package: kernel-patch-benh
Version: 20031005
Severity: normal
I am trying to build a 2.4.22 kernel with the benh, lowlatency and
preempt patches. This results in a build error:
make[4]: Entering directory `/usr/src/kernel-source-2.4.22/drivers/block'
gcc -D__KERNEL__ -I/usr/src/kernel-source-2.4.22/include -Wall
-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -O2
-fomit-frame-pointer -I/usr/src/kernel-source-2.4.22/arch/ppc
-fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized
-mmultiple -mstring -nostdinc -iwithprefix include
-DKBUILD_BASENAME=ll_rw_blk -DEXPORT_SYMTAB -c ll_rw_blk.c
ll_rw_blk.c: In function `blkdev_release_request':
ll_rw_blk.c:927: error: `rw' undeclared (first use in this function)
ll_rw_blk.c:927: error: (Each undeclared identifier is reported only once
ll_rw_blk.c:927: error: for each function it appears in.)
ll_rw_blk.c:927: error: `bh' undeclared (first use in this function)
ll_rw_blk.c:927: error: `count' undeclared (first use in this function)
make[4]: *** [ll_rw_blk.o] Error 1
make[4]: Leaving directory `/usr/src/kernel-source-2.4.22/drivers/block'
make[3]: *** [first_rule] Error 2
make[3]: Leaving directory `/usr/src/kernel-source-2.4.22/drivers/block'
make[2]: *** [_subdir_block] Error 2
make[2]: Leaving directory `/usr/src/kernel-source-2.4.22/drivers'
make[1]: *** [_dir_drivers] Error 2
make[1]: Leaving directory `/usr/src/kernel-source-2.4.22'
make: *** [stamp-build] Error 2
Upon examining the patches, it appears that both the lowlatency and benh
patch include a patch for ll_rw_blk.c. The offending line is part of the
benh patch. However, it seems it was applied in completely the wrong
place. This could be caused by the fact that the lowlatency patch tries
to patch ll_rw_blk.c in exactly the same place.
The lines in the benh patch are:
diff -Nur linux-2.4.22/drivers/block/ll_rw_blk.c linux-2.4-benh/drivers/block/ll_rw_blk.c
--- linux-2.4.22/drivers/block/ll_rw_blk.c 2003-08-25 13:44:41.000000000 +0200
+++ linux-2.4-benh/drivers/block/ll_rw_blk.c 2003-08-31 11:39:42.000000000 +0200
[snip]
@@ -1302,6 +1316,9 @@
kstat.pgpgin += count;
break;
}
+
+ if (block_dump)
+ printk("%s: %s block %lu/%u on %s\n", current->comm, rw == WRITE ? "WRITE" : "READ", bh->b_rsector, count, kdevname(bh->b_rdev)); }
/**
This patch ends up as lines 926-928, in a completely different function.
The lines in the lowlatency patch are:
diff -pruN kernel-source-2.4.22.orig/drivers/block/ll_rw_blk.c kernel-source-2.4.22/drivers/block/ll_rw_blk.c
--- kernel-source-2.4.22.orig/drivers/block/ll_rw_blk.c 2003-08-30 02:01:36.000000000 -0400
+++ kernel-source-2.4.22/drivers/block/ll_rw_blk.c 2003-09-17 21:23:17.000000000 -0400
@@ -1302,6 +1302,7 @@ void submit_bh(int rw, struct buffer_hea
kstat.pgpgin += count;
break;
}
+ conditional_schedule();
}
Frankly, I have no idea how this happened, so I could be reporting this
to the wrong package.
-- System Information:
Debian Release: testing/unstable
Architecture: powerpc
Kernel: Linux pomme 2.4.20-ben10mvz2 #1 Thu May 8 16:10:24 CEST 2003 ppc
Locale: LANG=C, LC_CTYPE=C
Versions of packages kernel-patch-benh depends on:
ii bash 2.05b-11 The GNU Bourne Again SHell
ii grep-dctrl 1.102 Grep Debian package information
ii kernel-patch-scripts 0.99.28 Scripts to help dealing with packa
ii patch 2.5.9-1 Apply a diff file to an original
-- no debconf information
--- End Message ---