Module Name: src
Committed By: martin
Date: Wed Oct 2 12:39:48 UTC 2024
Modified Files:
src/sbin/gpt [netbsd-10]: biosboot.c
Log Message:
Pull up following revision(s) (requested by lloyd in ticket #911):
sbin/gpt/biosboot.c: revision 1.33
Don't use kernel type daddr_t for disk offsets.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.10.1 src/sbin/gpt/biosboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.32 src/sbin/gpt/biosboot.c:1.32.10.1
--- src/sbin/gpt/biosboot.c:1.32 Thu Jun 20 10:56:38 2019
+++ src/sbin/gpt/biosboot.c Wed Oct 2 12:39:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: biosboot.c,v 1.32 2019/06/20 10:56:38 martin Exp $ */
+/* $NetBSD: biosboot.c,v 1.32.10.1 2024/10/02 12:39:48 martin Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.32 2019/06/20 10:56:38 martin Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.32.10.1 2024/10/02 12:39:48 martin Exp $");
#endif
#include <sys/stat.h>
@@ -167,7 +167,7 @@ set_bootable(gpt_t gpt, map_t map, map_t
}
static int
-biosboot(gpt_t gpt, daddr_t start, uint64_t size, u_int entry, uint8_t *label,
+biosboot(gpt_t gpt, off_t start, uint64_t size, u_int entry, uint8_t *label,
const char *bootpath, int active)
{
map_t mbrmap, m;
@@ -267,7 +267,7 @@ cmd_biosboot(gpt_t gpt, int argc, char *
#endif
int ch;
gpt_t ngpt = gpt;
- daddr_t start = 0;
+ off_t start = 0;
uint64_t size = 0;
int active = 0;
unsigned int entry = 0;
