2.5.1-dj1
Judging by the interest the last patch (which wasn't announced so publically) got, and the supportive emails I recieved, I figure there's enough interest for me to keep this up at least until Linus is ready to resync. (plus, Linus seems interested in me keeping this stuff in a ready-to-merge
state, which is good enough reason as any. 8)
Patch is available from:
http://www.codemonkey.org.uk/patches/2.5/patch-2.5.1-dj1.diff.bz2
On with the changelog..
This syncs up 2.5 right up to 2.4.17rc1.
Merge a few of the more trivial "2.5 material" salvaged from the last -ac tree, a few fixes from the kernel list, and a few other pending bits.. Some of these fixes haven't found their way back to Marcelo yet, but should show up in 2.4.17-rc2 / 2.4.18pre1 with any luck.
2.5.1-dj1
o Resync with 2.5.1
| drop reiserfs changes. 2.4's look to be more complete.
o Fix potential sysvfs oops. (Christoph Hellwig)
o Loopback driver deadlock fix. (Andrea Arcangeli)
o __devexit cleanups in drivers/net/ (Daniel Chen,
synclink, wdt_pci & via82cxxx_audio John Tapsell)
o Configure.help updates (Eric S. Raymond)
o Make reiserfs compile again. (Me)
o bio changes for ide floppy (Me)
| handle with care, compiles, but is unfinished.
o Make x86 identify_cpu() happen earlier (Me)
| PPro errata workaround & APIC setup got a little
| cleaner as a result.
o Blink keyboard LEDs on panic (From 2.4.13-ac)
o Change current->state frobbing to set_current_state() (From 2.4.13-ac)
o Add MODULE_LICENSE tags for acpi,md.c,fmvj18x, (From 2.4.13-ac)atyfb & fbmem.
2.5.1pre11-dj2
o Merge with 2.4.17rc1
o Activate out of order stores on IDT Winchips. (From 2.4.13-ac)
o ICH2 APIC support (From 2.4.13-ac)
o Activate Simple boot flag support (From 2.4.13-ac)
| was merged in -dj1, but not mentioned.
o Remove matroxfb PLL debugging message. (Me)2.5.1pre11-dj1
o Merge with 2.4.17pre8
Drop devfs changes. (Newer version in 2.5)
o Make ncr53c8xx bio aware. (Me)
Signature · 2 lines
| Dave Jones. http://www.codemonkey.org.uk | SuSE Labs .
Quoted 2 lines · Dave Jones
o bio changes for ide floppy (Me)
| handle with care, compiles, but is unfinished.
This is still badly broken -- I've attached my version I did for somebody friday.
drivers/ide/ide-floppy.c renamed from opt/kernel/linux-2.5.1/drivers/ide/ide-floppy.c +24 -43
@@ -336,23 +336,7 @@#define IDEFLOPPY_IOCTL_FORMAT_START 0x4602#define IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS 0x4603 -/* -* Special requests for our block device strategy routine. -*/ -#define IDEFLOPPY_FIRST_RQ 90 - -/* -* IDEFLOPPY_PC_RQ is used to queue a packet command in the request queue. -*/ -#define IDEFLOPPY_PC_RQ 90 - -#define IDEFLOPPY_LAST_RQ 90 - -/* -* A macro which can be used to check if a given request command -* originated in the driver or in the buffer cache layer. -*/ -#define IDEFLOPPY_RQ_CMD (cmd) ((cmd >= IDEFLOPPY_FIRST_RQ) && (cmd <= IDEFLOPPY_LAST_RQ)) +#define IDEFLOPPY_RQ (REQ_SPECIAL)/* * Error codes which are returned in rq->errors to the higher part
@@ -696,7 +680,7 @@/* Why does this happen? */ if (!rq)return ; -if (!IDEFLOPPY_RQ_CMD (rq->cmd)) { +if (rq->flags &IDEFLOPPY_RQ ) {ide_end_request (uptodate, hwgroup);return ; }
@@ -776,7 +760,7 @@ {ide_init_drive_cmd (rq); rq->buffer = (char *) pc; - rq->cmd =IDEFLOPPY_PC_RQ ; + rq->flags =IDEFLOPPY_RQ ; (void )ide_do_drive_cmd (drive, rq, ide_preempt); }
@@ -1192,6 +1176,7 @@ {int block = sector / floppy->bs_factor;int blocks = rq->nr_sectors / floppy->bs_factor; +int cmd =rq_data_dir (rq);#if IDEFLOPPY_DEBUG_LOG printk ("create_rw1%d_cmd: block == %d, blocks == %d\n",
@@ -1200,18 +1185,18 @@idefloppy_init_pc (pc);if (test_bit (IDEFLOPPY_USE_READ12 , &floppy->flags)) { - pc->c[0 ] = rq->cmd ==READ ?IDEFLOPPY_READ12_CMD :IDEFLOPPY_WRITE12_CMD ; + pc->c[0 ] = cmd ==READ ?IDEFLOPPY_READ12_CMD :IDEFLOPPY_WRITE12_CMD ;put_unaligned (htonl (blocks), (unsigned int *) &pc->c[6 ]); }else { - pc->c[0 ] = rq->cmd ==READ ?IDEFLOPPY_READ10_CMD :IDEFLOPPY_WRITE10_CMD ; + pc->c[0 ] = cmd ==READ ?IDEFLOPPY_READ10_CMD :IDEFLOPPY_WRITE10_CMD ;put_unaligned (htons (blocks), (unsigned short *) &pc->c[7 ]); }put_unaligned (htonl (block), (unsigned int *) &pc->c[2 ]); pc->callback = &idefloppy_rw_callback; pc->rq = rq; pc->b_data = rq->buffer; - pc->b_count = rq->cmd ==READ ?0 : rq->bio->bi_size; -if (rq->cmd ==WRITE ) + pc->b_count = cmd ==READ ?0 : rq->bio->bi_size; +if (rq->flags &REQ_RW )set_bit (PC_WRITING , &pc->flags); pc->buffer =NULL ; pc->request_transfer = pc->buffer_size = blocks * floppy->block_size;
@@ -1227,8 +1212,8 @@idefloppy_pc_t *pc;#if IDEFLOPPY_DEBUG_LOG -printk (KERN_INFO "rq_status: %d, rq_dev: %u, cmd: %d, errors: %d\n" ,rq->rq_status,(unsigned int ) rq->rq_dev,rq->cmd,rq->errors); -printk (KERN_INFO "sector: %ld, nr_sectors: %ld, current_nr_sectors: %ld\n" ,rq->sector,rq->nr_sectors,rq->current_nr_sectors); +printk (KERN_INFO "rq_status: %d, rq_dev: %u, flags: %lx, errors: %d\n" ,rq->rq_status,(unsigned int ) rq->rq_dev,rq->flags,rq->errors); +printk (KERN_INFO "sector: %ld, nr_sectors: %ld, current_nr_sectors: %d\n" ,rq->sector,rq->nr_sectors,rq->current_nr_sectors);#endif /* IDEFLOPPY_DEBUG_LOG */ if (rq->errors >=ERROR_MAX ) {
@@ -1240,24 +1225,20 @@idefloppy_end_request (0 ,HWGROUP (drive));return ide_stopped; } -switch (rq->cmd) { -case READ : -case WRITE : -if (rq->sector % floppy->bs_factor || rq->nr_sectors % floppy->bs_factor) { -printk ("%s: unsupported r/w request size\n" , drive->name); -idefloppy_end_request (0 ,HWGROUP (drive)); -return ide_stopped; - } - pc =idefloppy_next_pc_storage (drive); -idefloppy_create_rw_cmd (floppy, pc, rq, block); -break ; -case IDEFLOPPY_PC_RQ : - pc = (idefloppy_pc_t *) rq->buffer; -break ; -default : -printk (KERN_ERR "ide-floppy: unsupported command %x in request queue\n" , rq->cmd); -idefloppy_end_request (0 ,HWGROUP (drive)); +if (rq->flags &REQ_CMD ) { +if (rq->sector % floppy->bs_factor || rq->nr_sectors % floppy->bs_factor) { +printk ("%s: unsupported r/w request size\n" , drive->name); +idefloppy_end_request (0 ,HWGROUP (drive));return ide_stopped; + } + pc =idefloppy_next_pc_storage (drive); +idefloppy_create_rw_cmd (floppy, pc, rq, block); + }else if (rq->flags &IDEFLOPPY_RQ ) { + pc = (idefloppy_pc_t *) rq->buffer; + }else { +blk_dump_rq_flags (rq,"ide-floppy: unsupported command in queue" ); +idefloppy_end_request (0 ,HWGROUP (drive)); +return ide_stopped; } pc->rq = rq;return idefloppy_issue_pc (drive, pc);
@@ -1273,7 +1254,7 @@ide_init_drive_cmd (&rq); rq.buffer = (char *) pc; - rq.cmd =IDEFLOPPY_PC_RQ ; + rq.flags =IDEFLOPPY_RQ ;return ide_do_drive_cmd (drive, &rq, ide_wait); }
Signature · 1 line
Jens Axboe
Quoted 6 lines · Jens Axboe
Quoted 2 lines · Dave Jones
o bio changes for ide floppy (Me)
| handle with care, compiles, but is unfinished.This is still badly broken -- I've attached my version I did for somebody friday.
Yeah, I got distracted halfway through, and never got around to it. I'll drop this into the -dj2, thanks.
Dave.
Signature · 2 lines
| Dave Jones. http://www.codemonkey.org.uk | SuSE Labs