summaryrefslogtreecommitdiff
path: root/linux/dev/drivers
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-06-13 17:26:20 +0000
committerRoland McGrath <roland@gnu.org>1999-06-13 17:26:20 +0000
commite1d05b746d3d734b119efc290e3ff7b52fbe5feb (patch)
tree7051fe181a910f5d88e49b03a4489efaf9cfa718 /linux/dev/drivers
parenta248d597ea1b6c032f566141242ea424d6848df9 (diff)
1999-06-07 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* linux/dev/drivers/block/genhd.c [MACH] (mach_minor): New variable. (add_bsd_partition): New function. (bsd_disklabel_partition) [MACH]: Call add_bsd_partition. (msdos_partition) [MACH]: Set mach_minor to MINOR before calling bsd_disklabel_partition. * linux/dev/drivers/block/ide.c (do_request) [MACH]: Fix "bad access" message.
Diffstat (limited to 'linux/dev/drivers')
-rw-r--r--linux/dev/drivers/block/ide.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/dev/drivers/block/ide.c b/linux/dev/drivers/block/ide.c
index 590f993..2342099 100644
--- a/linux/dev/drivers/block/ide.c
+++ b/linux/dev/drivers/block/ide.c
@@ -1577,8 +1577,14 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq)
block = rq->sector;
blockend = block + rq->nr_sectors;
if ((blockend < block) || (blockend > drive->part[minor&PARTN_MASK].nr_sects)) {
+#ifdef MACH
+ printk ("%s%c: bad access: block=%ld, count=%ld, blockend=%ld, nr_sects\n",
+ drive->name, (minor&PARTN_MASK)?'0'+(minor&PARTN_MASK):' ',
+ block, rq->nr_sectors, blockend, drive->part[minor&PARTN_MASK].nr_sects);
+#else
printk("%s%c: bad access: block=%ld, count=%ld\n", drive->name,
(minor&PARTN_MASK)?'0'+(minor&PARTN_MASK):' ', block, rq->nr_sectors);
+#endif
goto kill_rq;
}
block += drive->part[minor&PARTN_MASK].start_sect + drive->sect0;