diff options
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/kern/subr_disk.c | 12 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 5c21b76fa35..ea31984b4e0 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.395 2015/08/31 03:42:51 yasuoka Exp $ +# $OpenBSD: GENERIC,v 1.396 2015/09/10 16:30:23 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -22,7 +22,6 @@ option MTRR # CPU memory range attributes control #option KGDB # Remote debugger support; exclusive of DDB #option "KGDB_DEVNAME=\"com\"",KGDBADDR=0x2f8,KGDBRATE=9600 -option GPT # GPT partition table support option NTFS # NTFS support option HIBERNATE # Hibernate support diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 11bad083a3a..eeb90afa13a 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.804 2015/08/25 01:57:44 bmercer Exp $ +# $OpenBSD: GENERIC,v 1.805 2015/09/10 16:30:23 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -26,7 +26,6 @@ option MTRR # CPU memory range attributes control option COMPAT_LINUX # binary compatibility with Linux -option GPT # GPT partition table support option NTFS # NTFS support option HIBERNATE # Hibernate support diff --git a/sys/conf/files b/sys/conf/files index 69c533857e1..543df4a38f7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.600 2015/09/03 09:16:33 mpi Exp $ +# $OpenBSD: files,v 1.601 2015/09/10 16:30:23 krw Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -673,7 +673,7 @@ file kern/kern_synch.c file kern/kern_tc.c file kern/kern_time.c file kern/kern_timeout.c -file kern/kern_uuid.c gpt +file kern/kern_uuid.c file kern/kern_watchdog.c !small_kernel file kern/kern_task.c file kern/kern_srp.c @@ -1018,7 +1018,7 @@ file lib/libkern/arch/${MACHINE_ARCH}/htons.S | lib/libkern/htons.c file lib/libkern/arch/${MACHINE_ARCH}/strncasecmp.S | lib/libkern/strncasecmp.c file lib/libz/adler32.c ppp_deflate | ipsec | crypto | bios -file lib/libz/crc32.c ppp_deflate | ipsec | crypto | gpt +file lib/libz/crc32.c ppp_deflate | ipsec | crypto file lib/libz/infback.c ppp_deflate | ipsec | crypto file lib/libz/inffast.c ppp_deflate | ipsec | crypto file lib/libz/inflate.c ppp_deflate | ipsec | crypto diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 8c2ed620f85..71f290b9db3 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.203 2015/09/10 14:28:17 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.204 2015/09/10 16:30:23 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -66,9 +66,7 @@ #include <dev/rndvar.h> #include <dev/cons.h> -#ifdef GPT #include <lib/libz/zlib.h> -#endif #include "softraid.h" @@ -106,9 +104,7 @@ void disk_attach_callback(void *); int readdisksector(struct buf *, void (*)(struct buf *), struct disklabel *, u_int64_t); -#ifdef GPT int gpt_chk_mbr(struct dos_partition *, struct disklabel *); -#endif /* * Compute checksum for disk label. @@ -370,7 +366,6 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), (bp->b_data[511] & 0xff); if (mbrtest != 0x55aa) goto notmbr; -#ifdef GPT if (gpt_chk_mbr(dp, lp) == 0) { error = readgptlabel(bp, strat, lp, partoffp ? &dospartoff : NULL, spoofonly); @@ -386,7 +381,6 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), goto notmbr; } } -#endif } if (ourpart == -1) { @@ -571,8 +565,6 @@ notfat: return (error); } -#ifdef GPT - int gpt_chk_hdr(struct gpt_header *); int gpt_chk_parts(struct gpt_header *, struct gpt_partition *); int get_fstype(struct uuid *); @@ -896,8 +888,6 @@ readgptlabel(struct buf *bp, void (*strat)(struct buf *), return (error); } -#endif - /* * Check new disk label for sensibility before setting it. */ diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 6f3deaa46e4..590082c9f09 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.67 2015/08/14 23:45:56 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.68 2015/09/10 16:30:23 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -541,10 +541,8 @@ int writedisklabel(dev_t, void (*)(struct buf *), struct disklabel *); int bounds_check_with_label(struct buf *, struct disklabel *); int readdoslabel(struct buf *, void (*)(struct buf *), struct disklabel *, daddr_t *, int); -#ifdef GPT int readgptlabel(struct buf *, void (*)(struct buf *), struct disklabel *, daddr_t *, int); -#endif #ifdef CD9660 int iso_disklabelspoof(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp); |