d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize with sys/i386/isa/diskslice_machdep.c revision 1.26.

Browse Source
This commit is contained in:
KATO Takenori 1997-09-28 05:52:51 +00:00
parent 674418c711
commit 348aa87048
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/pc98/pc98/atcompat_diskslice.c
View File

@ -35,7 +35,7 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: atcompat_diskslice.c,v 1.5 1997/02/22 09:43:31 peter Exp $
* $Id: atcompat_diskslice.c,v 1.6 1997/04/20 05:16:05 kato Exp $
*/
/*
@ -224,8 +224,9 @@ reread_mbr:
sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
partname);
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
printf("%s: invalid primary partition table: no magic\n",
sname);
if (bootverbose)
printf("%s: invalid primary partition table: no magic\n",
sname);
error = EINVAL;
goto done;
}
@ -419,8 +420,9 @@ atcompat_extended(dname, dev, strat, lp, ssp, ext_offset, ext_size,
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
partname);
printf("%s: invalid extended partition table: no magic\n",
sname);
if (bootverbose)
printf("%s: invalid extended partition table: no magic\n",
sname);
goto done;
}

12
sys/pc98/pc98/diskslice_machdep.c
View File

@ -35,7 +35,7 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: diskslice_machdep.c,v 1.8 1997/02/22 09:43:33 peter Exp $
* $Id: diskslice_machdep.c,v 1.9 1997/04/20 05:16:06 kato Exp $
*/
/*
@ -275,8 +275,9 @@ reread_mbr:
sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
partname);
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
printf("%s: invalid primary partition table: no magic\n",
sname);
if (bootverbose)
printf("%s: invalid primary partition table: no magic\n",
sname);
error = EINVAL;
goto done;
}
@ -578,8 +579,9 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset,
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
partname);
printf("%s: invalid extended partition table: no magic\n",
sname);
if (bootverbose)
printf("%s: invalid extended partition table: no magic\n",
sname);
goto done;
}