* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
@ 2002-10-16 4:41 ` Andrew Morton
2002-10-16 4:48 ` Andrew Morton
2002-10-16 7:01 ` Martin J. Bligh
2002-10-16 7:28 ` Adrian Bunk
` (6 subsequent siblings)
7 siblings, 2 replies; 31+ messages in thread
From: Andrew Morton @ 2002-10-16 4:41 UTC (permalink / raw)
To: Kernel Mailing List
Linus Torvalds wrote:
>
> A huge merging frenzy for the feature freeze,
Doesn't compile on ia32 uniprocessor. The owner of
changeset 1.852 is hereby debited 31 CPUs.
Also, non-IO_APIC kernels have not been linking for some time.
Here is a quick fix for both problems.
include/asm-i386/apic.h | 4 ++--
include/asm-i386/smp.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- 2.5.43/include/asm-i386/smp.h~mpparse-fix Tue Oct 15 21:26:18 2002
+++ 2.5.43-akpm/include/asm-i386/smp.h Tue Oct 15 21:26:31 2002
@@ -37,6 +37,7 @@
#endif /* CONFIG_CLUSTERED_APIC */
#endif
+#define BAD_APICID 0xFFu
#ifdef CONFIG_SMP
#ifndef __ASSEMBLY__
@@ -65,7 +66,6 @@ extern void zap_low_mappings (void);
* the real APIC ID <-> CPU # mapping.
*/
#define MAX_APICID 256
-#define BAD_APICID 0xFFu
extern volatile int cpu_to_physical_apicid[NR_CPUS];
extern volatile int physical_apicid_to_cpu[MAX_APICID];
extern volatile int cpu_to_logical_apicid[NR_CPUS];
--- 2.5.43/include/asm-i386/apic.h~mpparse-fix Tue Oct 15 21:34:03 2002
+++ 2.5.43-akpm/include/asm-i386/apic.h Tue Oct 15 21:34:05 2002
@@ -7,8 +7,6 @@
#include <asm/apicdef.h>
#include <asm/system.h>
-#ifdef CONFIG_X86_LOCAL_APIC
-
#define APIC_DEBUG 0
#if APIC_DEBUG
@@ -17,6 +15,8 @@
#define Dprintk(x...)
#endif
+#ifdef CONFIG_X86_LOCAL_APIC
+
/*
* Basic functions accessing APICs.
*/
.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 4:41 ` Andrew Morton
@ 2002-10-16 4:48 ` Andrew Morton
2002-10-16 7:01 ` Martin J. Bligh
1 sibling, 0 replies; 31+ messages in thread
From: Andrew Morton @ 2002-10-16 4:48 UTC (permalink / raw)
To: Kernel Mailing List
And here's a fix for CONFIG_MD:
--- 2.5.43/fs/partitions/check.c~md-fix Tue Oct 15 21:45:51 2002
+++ 2.5.43-akpm/fs/partitions/check.c Tue Oct 15 21:47:07 2002
@@ -522,9 +522,8 @@ int rescan_partitions(struct gendisk *di
continue;
add_partition(disk, p, from, size);
#if CONFIG_BLK_DEV_MD
- if (!state->parts[j].flags)
- continue;
- md_autodetect_dev(bdev->bd_dev+p);
+ if (state->parts[p].flags)
+ md_autodetect_dev(bdev->bd_dev+p);
#endif
}
kfree(state);
.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 4:41 ` Andrew Morton
2002-10-16 4:48 ` Andrew Morton
@ 2002-10-16 7:01 ` Martin J. Bligh
2002-10-16 17:41 ` Martin J. Bligh
2002-10-17 0:10 ` Thomas Molina
1 sibling, 2 replies; 31+ messages in thread
From: Martin J. Bligh @ 2002-10-16 7:01 UTC (permalink / raw)
To: Andrew Morton, Kernel Mailing List
>> A huge merging frenzy for the feature freeze,
>
> Doesn't compile on ia32 uniprocessor. The owner of
Arrgh. I booted that on my UP test box (it's still running).
I must have forgotten to do the fifth patch on that one or
something equally stupid.
> changeset 1.852 is hereby debited 31 CPUs.
/me hands them over.
Sorry,
M.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 7:01 ` Martin J. Bligh
@ 2002-10-16 17:41 ` Martin J. Bligh
2002-10-17 0:10 ` Thomas Molina
1 sibling, 0 replies; 31+ messages in thread
From: Martin J. Bligh @ 2002-10-16 17:41 UTC (permalink / raw)
To: Andrew Morton, Kernel Mailing List; +Cc: Linus Torvalds
>>> A huge merging frenzy for the feature freeze,
>>
>> Doesn't compile on ia32 uniprocessor. The owner of
>
> Arrgh. I booted that on my UP test box (it's still running).
> I must have forgotten to do the fifth patch on that one or
> something equally stupid.
OK, went back and checked my testing method - it only breaks if
you have Uniproc with IO-APIC support, which I didn't test 'cause
I knew it was broken anyway (yeah, I still should have caught that).
Now I feel *slightly* less stupid ;-)
>> changeset 1.852 is hereby debited 31 CPUs.
>
> /me hands them over.
Well, maybe half of them, all things considered ;-)
Here, have 15.5 CPUs ;-)
Thanks for the patch,
M.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 7:01 ` Martin J. Bligh
2002-10-16 17:41 ` Martin J. Bligh
@ 2002-10-17 0:10 ` Thomas Molina
1 sibling, 0 replies; 31+ messages in thread
From: Thomas Molina @ 2002-10-17 0:10 UTC (permalink / raw)
To: Martin J. Bligh; +Cc: Andrew Morton, Kernel Mailing List
On Wed, 16 Oct 2002, Martin J. Bligh wrote:
> >> A huge merging frenzy for the feature freeze,
> >
> > Doesn't compile on ia32 uniprocessor. The owner of
>
> Arrgh. I booted that on my UP test box (it's still running).
> I must have forgotten to do the fifth patch on that one or
> something equally stupid.
>
> > changeset 1.852 is hereby debited 31 CPUs.
>
> /me hands them over.
10 quatloos to the man with the fix
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
2002-10-16 4:41 ` Andrew Morton
@ 2002-10-16 7:28 ` Adrian Bunk
2002-10-16 8:25 ` Linux v2.5.43 nfs fails to boot, fix george anzinger
2002-10-16 7:31 ` Linux v2.5.43 Jens Axboe
` (5 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: Adrian Bunk @ 2002-10-16 7:28 UTC (permalink / raw)
To: Linus Torvalds, rread; +Cc: Kernel Mailing List
On Tue, 15 Oct 2002, Linus Torvalds wrote:
>...
> Summary of changes from v2.5.42 to v2.5.43
> ============================================
>...
> <rread@clusterfs.com>:
> o InterMezzo for 2.5
>...
It seems some required files weren't included in 2.5.43:
<-- snip -->
...
gcc -Wp,-MD,fs/intermezzo/.cache.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DKBUILD_BASENAME=cache -c -o fs/intermezzo/cache.o
fs/intermezzo/cache.c
In file included from fs/intermezzo/cache.c:42:
include/linux/intermezzo_fs.h:30: linux/intermezzo_lib.h: No such file or directory
include/linux/intermezzo_fs.h:31: linux/intermezzo_idl.h: No such file or directory
...
make[2]: *** [fs/intermezzo/cache.o] Error 1
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43 nfs fails to boot, fix
2002-10-16 7:28 ` Adrian Bunk
@ 2002-10-16 8:25 ` george anzinger
0 siblings, 0 replies; 31+ messages in thread
From: george anzinger @ 2002-10-16 8:25 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Linus Torvalds, rread, Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
Don't know if this is the correct fix, but it at least lets
the system boot with nfs.
--
George Anzinger george@mvista.com
High-res-timers:
http://sourceforge.net/projects/high-res-timers/
Preemption patch:
http://www.kernel.org/pub/linux/kernel/people/rml
[-- Attachment #2: fix-2.5.43-nfs.patch --]
[-- Type: text/plain, Size: 418 bytes --]
--- /usr/src/linux-2.5.43-posix/fs/nfs/proc.c~ Wed Oct 16 00:18:10 2002
+++ linux/fs/nfs/proc.c Wed Oct 16 01:10:40 2002
@@ -490,7 +490,7 @@
dprintk("NFS call fsinfo\n");
info->fattr->valid = 0;
- status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &info, 0);
+ status = rpc_call(server->client, NFSPROC_STATFS, fhandle, info, 0);
dprintk("NFS reply fsinfo: %d\n", status);
if (status)
goto out;
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
2002-10-16 4:41 ` Andrew Morton
2002-10-16 7:28 ` Adrian Bunk
@ 2002-10-16 7:31 ` Jens Axboe
2002-10-16 12:05 ` Ben Collins
2002-10-16 22:48 ` jbradford
2002-10-16 12:01 ` v2.5.43 patch: fix device_suspend() please apply Eric Blade
` (4 subsequent siblings)
7 siblings, 2 replies; 31+ messages in thread
From: Jens Axboe @ 2002-10-16 7:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Kernel Mailing List
On Tue, Oct 15 2002, Linus Torvalds wrote:
>
> A huge merging frenzy for the feature freeze, although I also spent a few
> days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> those off to the maintainer).
I put cdrecord rpms up here:
*.kernel.org/pub/linux/kernel/people/axboe/tools
The binary rpms are built on SuSE 8.1, there's a source rpm there too
though. This is 1.11a37 with Linus patch that allows you do to
cdrecord -dev=/dev/hdc -data -....
and burn without die-scsi.
--
Jens Axboe
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 7:31 ` Linux v2.5.43 Jens Axboe
@ 2002-10-16 12:05 ` Ben Collins
2002-10-16 12:09 ` Jens Axboe
2002-10-16 12:18 ` jlnance
2002-10-16 22:48 ` jbradford
1 sibling, 2 replies; 31+ messages in thread
From: Ben Collins @ 2002-10-16 12:05 UTC (permalink / raw)
To: Jens Axboe; +Cc: Kernel Mailing List
On Wed, Oct 16, 2002 at 09:31:55AM +0200, Jens Axboe wrote:
> On Tue, Oct 15 2002, Linus Torvalds wrote:
> >
> > A huge merging frenzy for the feature freeze, although I also spent a few
> > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > those off to the maintainer).
>
> I put cdrecord rpms up here:
>
> *.kernel.org/pub/linux/kernel/people/axboe/tools
>
> The binary rpms are built on SuSE 8.1, there's a source rpm there too
> though. This is 1.11a37 with Linus patch that allows you do to
Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
patches in the topdir would be fine.
Thanks
--
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo - http://www.deqo.com/
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:05 ` Ben Collins
@ 2002-10-16 12:09 ` Jens Axboe
2002-10-16 12:16 ` Ben Collins
2002-10-16 12:18 ` jlnance
1 sibling, 1 reply; 31+ messages in thread
From: Jens Axboe @ 2002-10-16 12:09 UTC (permalink / raw)
To: Ben Collins; +Cc: Kernel Mailing List
On Wed, Oct 16 2002, Ben Collins wrote:
> On Wed, Oct 16, 2002 at 09:31:55AM +0200, Jens Axboe wrote:
> > On Tue, Oct 15 2002, Linus Torvalds wrote:
> > >
> > > A huge merging frenzy for the feature freeze, although I also spent a few
> > > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > > those off to the maintainer).
> >
> > I put cdrecord rpms up here:
> >
> > *.kernel.org/pub/linux/kernel/people/axboe/tools
> >
> > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > though. This is 1.11a37 with Linus patch that allows you do to
>
> Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> patches in the topdir would be fine.
The patch is called linus-cdr.diff, tar ball of 1.1a37 can be found off
fresmeat.
--
Jens Axboe
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:09 ` Jens Axboe
@ 2002-10-16 12:16 ` Ben Collins
2002-10-16 12:17 ` Jens Axboe
0 siblings, 1 reply; 31+ messages in thread
From: Ben Collins @ 2002-10-16 12:16 UTC (permalink / raw)
To: Jens Axboe; +Cc: Kernel Mailing List
> > >
> > > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > > though. This is 1.11a37 with Linus patch that allows you do to
> >
> > Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> > patches in the topdir would be fine.
>
> The patch is called linus-cdr.diff, tar ball of 1.1a37 can be found off
> fresmeat.
>
Thanks. It's currently 403, though.
--
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo - http://www.deqo.com/
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:16 ` Ben Collins
@ 2002-10-16 12:17 ` Jens Axboe
2002-10-16 12:22 ` Ben Collins
0 siblings, 1 reply; 31+ messages in thread
From: Jens Axboe @ 2002-10-16 12:17 UTC (permalink / raw)
To: Ben Collins; +Cc: Kernel Mailing List
On Wed, Oct 16 2002, Ben Collins wrote:
> > > >
> > > > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > > > though. This is 1.11a37 with Linus patch that allows you do to
> > >
> > > Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> > > patches in the topdir would be fine.
> >
> > The patch is called linus-cdr.diff, tar ball of 1.1a37 can be found off
> > fresmeat.
> >
>
> Thanks. It's currently 403, though.
Its on hera (was when I wrote the email), so should show up sometime I
guess.
--
Jens Axboe
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:17 ` Jens Axboe
@ 2002-10-16 12:22 ` Ben Collins
2002-10-16 12:25 ` Jens Axboe
0 siblings, 1 reply; 31+ messages in thread
From: Ben Collins @ 2002-10-16 12:22 UTC (permalink / raw)
To: Jens Axboe; +Cc: Kernel Mailing List
On Wed, Oct 16, 2002 at 02:17:18PM +0200, Jens Axboe wrote:
> On Wed, Oct 16 2002, Ben Collins wrote:
> > > > >
> > > > > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > > > > though. This is 1.11a37 with Linus patch that allows you do to
> > > >
> > > > Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> > > > patches in the topdir would be fine.
> > >
> > > The patch is called linus-cdr.diff, tar ball of 1.1a37 can be found off
> > > fresmeat.
> > >
> >
> > Thanks. It's currently 403, though.
>
> Its on hera (was when I wrote the email), so should show up sometime I
> guess.
No, 403 == perm denied :)
--
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo - http://www.deqo.com/
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:22 ` Ben Collins
@ 2002-10-16 12:25 ` Jens Axboe
0 siblings, 0 replies; 31+ messages in thread
From: Jens Axboe @ 2002-10-16 12:25 UTC (permalink / raw)
To: Ben Collins; +Cc: Kernel Mailing List
On Wed, Oct 16 2002, Ben Collins wrote:
> On Wed, Oct 16, 2002 at 02:17:18PM +0200, Jens Axboe wrote:
> > On Wed, Oct 16 2002, Ben Collins wrote:
> > > > > >
> > > > > > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > > > > > though. This is 1.11a37 with Linus patch that allows you do to
> > > > >
> > > > > Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> > > > > patches in the topdir would be fine.
> > > >
> > > > The patch is called linus-cdr.diff, tar ball of 1.1a37 can be found off
> > > > fresmeat.
> > > >
> > >
> > > Thanks. It's currently 403, though.
> >
> > Its on hera (was when I wrote the email), so should show up sometime I
> > guess.
>
> No, 403 == perm denied :)
Ah duh, I should read the mail :)
Fixed now.
--
Jens Axboe
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 12:05 ` Ben Collins
2002-10-16 12:09 ` Jens Axboe
@ 2002-10-16 12:18 ` jlnance
2002-10-16 12:27 ` Ben Collins
1 sibling, 1 reply; 31+ messages in thread
From: jlnance @ 2002-10-16 12:18 UTC (permalink / raw)
To: Ben Collins; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
On Wed, Oct 16, 2002 at 08:05:29AM -0400, Ben Collins wrote:
> > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > though. This is 1.11a37 with Linus patch that allows you do to
>
> Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> patches in the topdir would be fine.
Hi Ben,
I attached a perl script to this email that will let you turn an rpm
into a cpio file. To use it do:
rpm2cpio some.file.rpm | cpio --extract
Hope this helps.
Jim
[-- Attachment #2: rpm2cpio --]
[-- Type: text/plain, Size: 1416 bytes --]
#! /usr/bin/env perl
# why does the world need another rpm2cpio? because the existing one
# won't build unless you have half a ton of things that aren't really
# required for it, since it uses the same library used to extract RPM's.
# in particular, it won't build on the HPsUX box i'm on.
# add a path if desired
$gzip = "gzip";
sub printhelp {
print "rpm2cpio, perl version by orabidoo <odar\@pobox.com>\n";
print "use: rpm2cpio [file.rpm]\n";
print "dumps the contents to stdout as a GNU cpio archive\n";
exit 0;
}
if ($#ARGV == -1) {
printhelp if -t STDIN;
$f = "STDIN";
} elsif ($#ARGV == 0) {
open(F, "< $ARGV[0]") or die "Can't read file $ARGV[0]\n";
$f = 'F';
} else {
printhelp;
}
printhelp if -t STDOUT;
# gobble the file up
undef $/;
$|=1;
$rpm = <$f>;
close ($f);
($magic, $major, $minor, $crap) = unpack("NCC C90", $rpm);
die "Not an RPM\n" if $magic != 0xedabeedb;
die "Not a version 3 RPM\n" if $major != 3;
$rpm = substr($rpm, 96);
while ($rpm ne '') {
$rpm =~ s/^\c@*//s;
($magic, $crap, $sections, $bytes) = unpack("N4", $rpm);
$smagic = unpack("n", $rpm);
last if $smagic eq 0x1f8b;
die "Error: header not recognized\n" if $magic != 0x8eade801;
$rpm = substr($rpm, 16*(1+$sections) + $bytes);
}
die "bogus RPM\n" if $rpm eq '';
open(ZCAT, "|gzip -cd") || die "can't pipe to gzip\n";
print STDERR "CPIO archive found!\n";
print ZCAT $rpm;
close ZCAT;
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 12:18 ` jlnance
@ 2002-10-16 12:27 ` Ben Collins
0 siblings, 0 replies; 31+ messages in thread
From: Ben Collins @ 2002-10-16 12:27 UTC (permalink / raw)
To: jlnance; +Cc: linux-kernel
On Wed, Oct 16, 2002 at 08:18:42AM -0400, jlnance@unity.ncsu.edu wrote:
> On Wed, Oct 16, 2002 at 08:05:29AM -0400, Ben Collins wrote:
>
> > > The binary rpms are built on SuSE 8.1, there's a source rpm there too
> > > though. This is 1.11a37 with Linus patch that allows you do to
> >
> > Can us non-rpm'ers get a tarball, please? Even an upstream tarball with
> > patches in the topdir would be fine.
>
> Hi Ben,
> I attached a perl script to this email that will let you turn an rpm
> into a cpio file. To use it do:
>
> rpm2cpio some.file.rpm | cpio --extract
>
> Hope this helps.
Thanks. I myself know how to do this :) Just that not everyone uses rpm,
and not everyone knows how to extract things from it.
I don't suspect that the rpm users know that "ar x foo.deb data.tar.gz"
will extract binaries from a .deb either :)
--
Debian - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
Subversion - http://subversion.tigris.org/
Deqo - http://www.deqo.com/
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 7:31 ` Linux v2.5.43 Jens Axboe
2002-10-16 12:05 ` Ben Collins
@ 2002-10-16 22:48 ` jbradford
1 sibling, 0 replies; 31+ messages in thread
From: jbradford @ 2002-10-16 22:48 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel
> > A huge merging frenzy for the feature freeze, although I also spent a few
> > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > those off to the maintainer).
>
> I put cdrecord rpms up here:
>
> *.kernel.org/pub/linux/kernel/people/axboe/tools
>
> The binary rpms are built on SuSE 8.1, there's a source rpm there too
> though. This is 1.11a37 with Linus patch that allows you do to
>
> cdrecord -dev=/dev/hdc -data -....
>
> and burn without die-scsi.
Is die-scsi a typo, or a description of the success of ide-scsi? :-)
John.
^ permalink raw reply [flat|nested] 31+ messages in thread
* v2.5.43 patch: fix device_suspend() please apply
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
` (2 preceding siblings ...)
2002-10-16 7:31 ` Linux v2.5.43 Jens Axboe
@ 2002-10-16 12:01 ` Eric Blade
2002-10-16 14:57 ` Linux v2.5.43 John Levon
` (3 subsequent siblings)
7 siblings, 0 replies; 31+ messages in thread
From: Eric Blade @ 2002-10-16 12:01 UTC (permalink / raw)
To: linux-kernel
--- a/include/linux/device.h Sat Oct 12 00:22:19 2002
+++ linux/include/linux/device.h Mon Oct 14 01:48:47 2002
@@ -40,6 +40,7 @@
SUSPEND_SAVE_STATE,
SUSPEND_DISABLE,
SUSPEND_POWER_DOWN,
+ SUSPEND_SHUT_DOWN,
};
enum {
--- a/drivers/base/power.c Sat Oct 12 00:22:11 2002
+++ linux/drivers/base/power.c Mon Oct 14 01:49:22 2002
@@ -31,7 +31,7 @@
struct device * prev = NULL;
int error = 0;
- if(level == SUSPEND_POWER_DOWN)
+ if (level == SUSPEND_SHUT_DOWN)
printk(KERN_EMERG "Shutting down devices\n");
else
printk(KERN_EMERG "Suspending devices\n");
@@ -41,11 +41,11 @@
struct device * dev = get_device_locked(to_dev(node));
if (dev) {
spin_unlock(&device_lock);
- if(dev->driver) {
- if(level == SUSPEND_POWER_DOWN) {
- if(dev->driver->remove)
+ if (dev->driver) {
+ if (level == SUSPEND_SHUT_DOWN) {
+ if (dev->driver->remove)
dev->driver->remove(dev);
- } else if(dev->driver->suspend)
+ } else if (dev->driver->suspend)
error =
dev->driver->suspend(dev,state,level);
}
if (prev)
@@ -96,7 +96,7 @@
*/
void device_shutdown(void)
{
- device_suspend(4, SUSPEND_POWER_DOWN);
+ device_suspend(4, SUSPEND_SHUT_DOWN);
}
EXPORT_SYMBOL(device_suspend);
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
` (3 preceding siblings ...)
2002-10-16 12:01 ` v2.5.43 patch: fix device_suspend() please apply Eric Blade
@ 2002-10-16 14:57 ` John Levon
2002-10-16 15:02 ` Matthew Wilcox
2002-10-16 21:05 ` Bill Davidsen
` (2 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: John Levon @ 2002-10-16 14:57 UTC (permalink / raw)
To: Kernel Mailing List; +Cc: willy, akpm
On Tue, Oct 15, 2002 at 08:44:10PM -0700, Linus Torvalds wrote:
> John Levon <levon@movementarian.org>:
> o oprofile - core
Note that anybody actually wanting to use the thing needs an additional
fix like the below, or most of the samples end up being dropped on the
floor.
Matthew, can we submit the proper fix (using cond_resched ?) at some
point ?
thanks
john
--- linux-linus/fs/locks.c Sat Sep 28 15:56:28 2002
+++ linux/fs/locks.c Wed Oct 2 04:15:54 2002
@@ -727,11 +727,11 @@
}
unlock_kernel();
- if (found)
- yield();
-
if (new_fl->fl_type == F_UNLCK)
return 0;
+
+ if (found)
+ yield();
lock_kernel();
for_each_lock(inode, before) {
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 14:57 ` Linux v2.5.43 John Levon
@ 2002-10-16 15:02 ` Matthew Wilcox
0 siblings, 0 replies; 31+ messages in thread
From: Matthew Wilcox @ 2002-10-16 15:02 UTC (permalink / raw)
To: John Levon, Linus Torvalds; +Cc: Kernel Mailing List, willy, akpm
On Wed, Oct 16, 2002 at 03:57:28PM +0100, John Levon wrote:
> Matthew, can we submit the proper fix (using cond_resched ?) at some
> point ?
yes, i have the proper fix in my tree, along with some other changes I
want to make. Here's the better patch:
diff -urpNX dontdiff linux-2.5.43/fs/locks.c linux-2.5.43-flock/fs/locks.c
--- linux-2.5.43/fs/locks.c 2002-09-27 20:10:43.000000000 -0700
+++ linux-2.5.43-flock/fs/locks.c 2002-10-10 18:03:10.000000000 -0700
@@ -727,12 +726,16 @@ static int flock_lock_file(struct file *
}
unlock_kernel();
- if (found)
- yield();
-
if (new_fl->fl_type == F_UNLCK)
return 0;
+ /*
+ * If a higher-priority process was blocked on the old file lock,
+ * give it the opportunity to lock the file.
+ */
+ if (found)
+ cond_resched();
+
lock_kernel();
for_each_lock(inode, before) {
struct file_lock *fl = *before;
--
Revolutions do not require corporate support.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
` (4 preceding siblings ...)
2002-10-16 14:57 ` Linux v2.5.43 John Levon
@ 2002-10-16 21:05 ` Bill Davidsen
2002-10-16 21:35 ` Shawn
2002-10-18 7:08 ` Andres Salomon
2002-10-18 17:00 ` Adrian Bunk
7 siblings, 1 reply; 31+ messages in thread
From: Bill Davidsen @ 2002-10-16 21:05 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Kernel Mailing List
On Tue, 15 Oct 2002, Linus Torvalds wrote:
>
> A huge merging frenzy for the feature freeze, although I also spent a few
> days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> those off to the maintainer).
I hope you haven't broken running WITH ide-scsi, because most people still
run 2.4 kernels in real life and only test 2.5 because someone has to do
it. Reconfiguring the system to use ide-scsi or not is just one more PITA
thing which needs to be done, or more likely forgotten, with every new
kernel.
--
bill davidsen <davidsen@tmr.com>
CTO, TMR Associates, Inc
Doing interesting things with little computers since 1979.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 21:05 ` Bill Davidsen
@ 2002-10-16 21:35 ` Shawn
2002-10-16 21:48 ` Linus Torvalds
2002-10-18 19:34 ` Bill Davidsen
0 siblings, 2 replies; 31+ messages in thread
From: Shawn @ 2002-10-16 21:35 UTC (permalink / raw)
To: Bill Davidsen; +Cc: Linus Torvalds, Kernel Mailing List
On 10/16, Bill Davidsen said something like:
> On Tue, 15 Oct 2002, Linus Torvalds wrote:
> > A huge merging frenzy for the feature freeze, although I also spent a few
> > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > those off to the maintainer).
>
> I hope you haven't broken running WITH ide-scsi, because most people still
> run 2.4 kernels in real life and only test 2.5 because someone has to do
> it. Reconfiguring the system to use ide-scsi or not is just one more PITA
> thing which needs to be done, or more likely forgotten, with every new
> kernel.
Honestly, I think it's ok to bust the old stuff if needed. This is
simply my opinion from a user standpoint.
It's really just one kernel argument or /etc/modules.conf modification
to fix the old setup, asnd likely, if you set it up in the first place,
you can un-set it up.
--
Shawn Leas
core@enodev.com
There's a pizza place near where I live that sells only slices...
in the back you can see a guy tossing a triangle in the air...
-- Stephen Wright
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 21:35 ` Shawn
@ 2002-10-16 21:48 ` Linus Torvalds
2002-10-17 13:14 ` Bill Davidsen
2002-10-18 19:34 ` Bill Davidsen
1 sibling, 1 reply; 31+ messages in thread
From: Linus Torvalds @ 2002-10-16 21:48 UTC (permalink / raw)
To: Shawn; +Cc: Bill Davidsen, Kernel Mailing List
On Wed, 16 Oct 2002, Shawn wrote:
> On 10/16, Bill Davidsen said something like:
> > On Tue, 15 Oct 2002, Linus Torvalds wrote:
> > > A huge merging frenzy for the feature freeze, although I also spent a few
> > > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > > those off to the maintainer).
> >
> > I hope you haven't broken running WITH ide-scsi, because most people still
> > run 2.4 kernels in real life and only test 2.5 because someone has to do
> > it. Reconfiguring the system to use ide-scsi or not is just one more PITA
> > thing which needs to be done, or more likely forgotten, with every new
> > kernel.
>
> Honestly, I think it's ok to bust the old stuff if needed. This is
> simply my opinion from a user standpoint.
Anyway, ide-scsi should work as well as it ever did, which is not to say
too well. It's just that the IDE native implementation is cleaner and
simpler, and a _hell_ of a lot easier to use.
The scsi-generic layer is a total nightmare. If you want to write to the
device that is /dev/scd0, you can't just use /dev/scd0, you have to use
the right /dev/sgX, and the X depends on how many disks etc you have in
the system and where your controller is. The amount of crap you have to do
with things like "cdrecord -scanbus" to just figure out what the right
device is is just ludicrous.
With the native IDE setup, if your CD is /dev/hdc, then that's what you
use for cdburning too. Just do "cdrecord dev=/dev/hdc" and that's it. No
made-up SCSI bus numbers, no need to try to figure out what the right
thing is, no crap.
In fact, I hope that in linux-2.7.x the SCSI layer itself will start using
the same interface, so that we can drop scsi-generic some day completely.
The interface is totally generic, and doesn't have anything to do with IDE
per se - ide-cd.c just needed to be cleaned up enough to be able to use
it. The interface really just says "hey, you can push SCSI commands down
the request queue" (and ide-cd.c will take the SCSI command and convert it
into an ATAPI packet command - which is a pretty trivial transform).
So right now, you can do "cdrecord dev=/dev/hdc ..", but because I didn't
bother to try to figure out what the SCSI layer wants to do you can _not_
do the simple "cdrecord dev=/dev/scd0 .." if you have a SCSI disk. That's
nothing fundamental, I just don't think SCSI CD-RW's are very interesting
any more, since they are overpriced and hard to find. I hope some SCSI
fanatic will do the (probably trivial) addition to sr.c to accept the SCSI
ioctl interface.
(Hint for such SCSI users: you should just do:
- call "scsi_cmd_ioctl()" in your ioctl routine, and if it returns
ENOTTY that means that it wasn't one of the SCSI generic commands.
- make the request queue handler understand that requests with the
REQ_BLOCK_PC flag set are SCSI packet commands, and "req->cmd" contains
the command, while "req->data" and "req->data_len" are the data for the
command)
- make sure that an open() with the O_NONBLOCK flag set will succeed even
if the medium is not accessible (and will succeed even if it's a
writable open).
and that should be pretty much it).
Linus
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 21:48 ` Linus Torvalds
@ 2002-10-17 13:14 ` Bill Davidsen
0 siblings, 0 replies; 31+ messages in thread
From: Bill Davidsen @ 2002-10-17 13:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Shawn, Kernel Mailing List
On Wed, 16 Oct 2002, Linus Torvalds wrote:
> On Wed, 16 Oct 2002, Shawn wrote:
> > On 10/16, Bill Davidsen said something like:
> > > On Tue, 15 Oct 2002, Linus Torvalds wrote:
> > > > A huge merging frenzy for the feature freeze, although I also spent a few
> > > > days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> > > > CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> > > > those off to the maintainer).
> > >
> > > I hope you haven't broken running WITH ide-scsi, because most people still
> > > run 2.4 kernels in real life and only test 2.5 because someone has to do
> > > it. Reconfiguring the system to use ide-scsi or not is just one more PITA
> > > thing which needs to be done, or more likely forgotten, with every new
> > > kernel.
> >
> > Honestly, I think it's ok to bust the old stuff if needed. This is
> > simply my opinion from a user standpoint.
>
> Anyway, ide-scsi should work as well as it ever did, which is not to say
> too well. It's just that the IDE native implementation is cleaner and
> simpler, and a _hell_ of a lot easier to use.
Clearly you are talking about systems which are not used in production,
and which run 2.5 kernels all the time. Having to switch back and forth in
all the naming conventions, device to interface assignments, etc, is a
PITA. And like anything you have to do to convert, some day you will
forget a step and leave your production 2.4 capability broken.
> The scsi-generic layer is a total nightmare. If you want to write to the
> device that is /dev/scd0, you can't just use /dev/scd0, you have to use
> the right /dev/sgX, and the X depends on how many disks etc you have in
> the system and where your controller is. The amount of crap you have to do
> with things like "cdrecord -scanbus" to just figure out what the right
> device is is just ludicrous.
Do you mean that the new cdrecord -scanbus will now scan the IDE bus(es)
as well, or that we can just try to find time to write something else
which lists all the CD devices? You are aware that you don't *need* to
know any of that /dev/sgX stuff, you just say dev=b,d,l (bus, device, lun)
and cdrecord does it?
> So right now, you can do "cdrecord dev=/dev/hdc ..", but because I didn't
> bother to try to figure out what the SCSI layer wants to do you can _not_
> do the simple "cdrecord dev=/dev/scd0 .." if you have a SCSI disk. That's
> nothing fundamental, I just don't think SCSI CD-RW's are very interesting
> any more, since they are overpriced and hard to find. I hope some SCSI
> fanatic will do the (probably trivial) addition to sr.c to accept the SCSI
> ioctl interface.
Again, I think you have never done any of this in a production
environment. Joe User burning a little music on his one CD-RW and a
production CD based distribution or backup setup are as related as the guy
with the the single Celeron and a NUMA system. SCSI allow writing multiple
CDs at once without fighting with "what's on the same cable," and allows
more than a few drives. And these days the writers are becoming DVD, which
makes it even more desirable to have an adult-strength bus.
> (Hint for such SCSI users: you should just do:
>
> - call "scsi_cmd_ioctl()" in your ioctl routine, and if it returns
> ENOTTY that means that it wasn't one of the SCSI generic commands.
>
> - make the request queue handler understand that requests with the
> REQ_BLOCK_PC flag set are SCSI packet commands, and "req->cmd" contains
> the command, while "req->data" and "req->data_len" are the data for the
> command)
>
> - make sure that an open() with the O_NONBLOCK flag set will succeed even
> if the medium is not accessible (and will succeed even if it's a
> writable open).
>
> and that should be pretty much it).
All tips and hints appreciated.
--
bill davidsen <davidsen@tmr.com>
CTO, TMR Associates, Inc
Doing interesting things with little computers since 1979.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 21:35 ` Shawn
2002-10-16 21:48 ` Linus Torvalds
@ 2002-10-18 19:34 ` Bill Davidsen
2002-10-19 17:43 ` bill davidsen
1 sibling, 1 reply; 31+ messages in thread
From: Bill Davidsen @ 2002-10-18 19:34 UTC (permalink / raw)
To: Shawn; +Cc: Linus Torvalds, Kernel Mailing List
On Wed, 16 Oct 2002, Shawn wrote:
> On 10/16, Bill Davidsen said something like:
> > I hope you haven't broken running WITH ide-scsi, because most people still
> > run 2.4 kernels in real life and only test 2.5 because someone has to do
> > it. Reconfiguring the system to use ide-scsi or not is just one more PITA
> > thing which needs to be done, or more likely forgotten, with every new
> > kernel.
>
> Honestly, I think it's ok to bust the old stuff if needed. This is
> simply my opinion from a user standpoint.
>
> It's really just one kernel argument or /etc/modules.conf modification
> to fix the old setup, asnd likely, if you set it up in the first place,
> you can un-set it up.
And change every script from dev=b,d,l to dev=/dev/cdN. Without hitting
the actual SCSI CD's, and of course the scd0 (ATAPI on ide-scsi) goes away
so you have to rename all of your real SCSI CD's.
On a simple system with one ATAPI CD the problem is small, but on a larger
and busier system with a fair number of CD-RW drives, it is likely to be a
real pain, and if you forget to convert back you mess up production stuff.
It's not impossible, just something I would rather not do unless the
system is going permanently to 2.6, maybe not even then, since what I have
works fine.
--
bill davidsen <davidsen@tmr.com>
CTO, TMR Associates, Inc
Doing interesting things with little computers since 1979.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-18 19:34 ` Bill Davidsen
@ 2002-10-19 17:43 ` bill davidsen
0 siblings, 0 replies; 31+ messages in thread
From: bill davidsen @ 2002-10-19 17:43 UTC (permalink / raw)
To: linux-kernel
In article
<Pine.LNX.3.96.1021018152918.23760A-100000@gatekeeper.tmr.com>,
I'm happy to report that ide-scsi is still working fine, both for CD,
CD-RW and ZIP drives. Which makes life nice on a system with both ATAPI
and SCSI CD devices, since my scripts need only get the bus and id, not
use another device name format.
Bill Davidsen <davidsen@tmr.com> wrote:
| On Wed, 16 Oct 2002, Shawn wrote:
|
| > On 10/16, Bill Davidsen said something like:
|
| > > I hope you haven't broken running WITH ide-scsi, because most people still
| > > run 2.4 kernels in real life and only test 2.5 because someone has to do
| > > it. Reconfiguring the system to use ide-scsi or not is just one more PITA
| > > thing which needs to be done, or more likely forgotten, with every new
| > > kernel.
| >
| > Honestly, I think it's ok to bust the old stuff if needed. This is
| > simply my opinion from a user standpoint.
| >
| > It's really just one kernel argument or /etc/modules.conf modification
| > to fix the old setup, asnd likely, if you set it up in the first place,
| > you can un-set it up.
|
| And change every script from dev=b,d,l to dev=/dev/cdN. Without hitting
| the actual SCSI CD's, and of course the scd0 (ATAPI on ide-scsi) goes away
| so you have to rename all of your real SCSI CD's.
|
| On a simple system with one ATAPI CD the problem is small, but on a larger
| and busier system with a fair number of CD-RW drives, it is likely to be a
| real pain, and if you forget to convert back you mess up production stuff.
|
| It's not impossible, just something I would rather not do unless the
| system is going permanently to 2.6, maybe not even then, since what I have
| works fine.
|
| --
| bill davidsen <davidsen@tmr.com>
| CTO, TMR Associates, Inc
| Doing interesting things with little computers since 1979.
|
| -
| To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
| the body of a message to majordomo@vger.kernel.org
| More majordomo info at http://vger.kernel.org/majordomo-info.html
| Please read the FAQ at http://www.tux.org/lkml/
|
--
bill davidsen <davidsen@tmr.com>
CTO, TMR Associates, Inc
Doing interesting things with little computers since 1979.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
` (5 preceding siblings ...)
2002-10-16 21:05 ` Bill Davidsen
@ 2002-10-18 7:08 ` Andres Salomon
2002-10-18 7:02 ` David S. Miller
2002-10-18 17:00 ` Adrian Bunk
7 siblings, 1 reply; 31+ messages in thread
From: Andres Salomon @ 2002-10-18 7:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: davem, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]
This patch is required to successfully compile 2.5.43 on an ultrasparc.
time.c is missing a header file.
On Tue, Oct 15, 2002 at 08:44:10PM -0700, Linus Torvalds wrote:
>
>
> A huge merging frenzy for the feature freeze, although I also spent a few
> days getting rid of the need for ide-scsi.c and the SCSI layer to burn
> CD-ROM's with the IDE driver (it still needs an update to cdrecord, I sent
> those off to the maintainer).
>
> The most fundamental stuff is probably RCU and oprofile, but there's stuff
> all over the map here..
>
> Linus
>
> ------
>
> Summary of changes from v2.5.42 to v2.5.43
> ============================================
>
[...]
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
It's not denial. I'm just selective about the reality I accept.
-- Bill Watterson
[-- Attachment #2: time.c.diff --]
[-- Type: text/plain, Size: 320 bytes --]
--- a/arch/sparc64/kernel/time.c 2002-10-18 02:31:36.000000000 -0400
+++ b/arch/sparc64/kernel/time.c 2002-10-18 02:33:38.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/ioport.h>
#include <linux/mc146818rtc.h>
#include <linux/delay.h>
+#include <linux/profile.h>
#include <asm/oplib.h>
#include <asm/mostek.h>
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: Linux v2.5.43
2002-10-16 3:44 Linux v2.5.43 Linus Torvalds
` (6 preceding siblings ...)
2002-10-18 7:08 ` Andres Salomon
@ 2002-10-18 17:00 ` Adrian Bunk
2002-10-18 17:03 ` Ben Collins
7 siblings, 1 reply; 31+ messages in thread
From: Adrian Bunk @ 2002-10-18 17:00 UTC (permalink / raw)
To: Linus Torvalds, Ben Collins; +Cc: Kernel Mailing List
On Tue, 15 Oct 2002, Linus Torvalds wrote:
>...
> Summary of changes from v2.5.42 to v2.5.43
> ============================================
>...
> Ben Collins <bcollins@debian.org>:
> o Linux IEEE-1394 Updates
>...
This patch added an argument "flags" to the prototypes of
sbp2_handle_physdma_write and sbp2_handle_physdma_read in
drivers/ieee1394/sbp2.h but doesn't include the corresponding changes to
drivers/ieee1394/sbp2.c resulting in the following compile error:
<-- snip -->
...
gcc -Wp,-MD,drivers/ieee1394/.sbp2.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing
-fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic
-nostdinc -iwithprefix include -DKBUILD_BASENAME=sbp2 -c -o
drivers/ieee1394/sbp2.o drivers/ieee1394/sbp2.c
drivers/ieee1394/sbp2.c:1516: conflicting types for `sbp2_handle_physdma_write'
drivers/ieee1394/sbp2.h:513: previous declaration of `sbp2_handle_physdma_write'
drivers/ieee1394/sbp2.c:1532: conflicting types for `sbp2_handle_physdma_read'
drivers/ieee1394/sbp2.h:515: previous declaration of `sbp2_handle_physdma_read'
make[2]: *** [drivers/ieee1394/sbp2.o] Error 1
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 31+ messages in thread