git: e06f07bc3f48 - stable/13 - kerneldump: remove physical argument from d_dumper
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Jun 2022 19:35:38 UTC
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=e06f07bc3f483c78d07b38733b83163b8ba88126
commit e06f07bc3f483c78d07b38733b83163b8ba88126
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-05-13 13:39:29 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2022-06-27 19:32:06 +0000
kerneldump: remove physical argument from d_dumper
The physical address argument is essentially ignored by every dumper
method. In addition, the dump routines don't actually pass a real
address; every call to dump_append() passes a value of zero for
physical.
Reviewed by: markj
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D35173
(cherry picked from commit 489ba2223676ec251ab1bfe2906d2a62959c8ce3)
---
sys/cam/ata/ata_da.c | 4 ++--
sys/cam/mmc/mmc_da.c | 3 +--
sys/cam/nvme/nvme_da.c | 4 ++--
sys/cam/scsi/scsi_da.c | 4 ++--
sys/dev/aac/aac_disk.c | 6 +++---
sys/dev/ida/ida_disk.c | 2 +-
sys/dev/ips/ips_disk.c | 6 ++----
sys/dev/mfi/mfi_disk.c | 2 +-
sys/dev/mfi/mfi_syspd.c | 3 +--
sys/dev/mmc/mmcsd.c | 6 ++----
sys/dev/nvd/nvd.c | 2 +-
sys/dev/virtio/block/virtio_blk.c | 5 ++---
sys/dev/xen/blkfront/blkfront.c | 3 +--
sys/geom/nop/g_nop.c | 3 +--
sys/geom/raid/g_raid.c | 14 ++++++--------
sys/geom/raid/g_raid.h | 4 ++--
sys/geom/raid/g_raid_tr_if.m | 1 -
sys/geom/raid/tr_concat.c | 6 +++---
sys/geom/raid/tr_raid0.c | 6 +++---
sys/geom/raid/tr_raid1.c | 7 +++----
sys/geom/raid/tr_raid1e.c | 8 ++++----
sys/geom/raid/tr_raid5.c | 4 ++--
sys/kern/kern_shutdown.c | 2 +-
sys/kern/kern_vnodedumper.c | 4 +---
sys/netinet/netdump/netdump_client.c | 6 ++----
sys/sys/conf.h | 1 -
26 files changed, 49 insertions(+), 67 deletions(-)
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index abcc63b8df5f..89c7bfa5ac70 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1094,7 +1094,7 @@ adastrategy(struct bio *bp)
}
static int
-adadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+adadump(void *arg, void *virtual, off_t offset, size_t length)
{
struct cam_periph *periph;
struct ada_softc *softc;
@@ -3530,7 +3530,7 @@ adaflush(void)
/* If we panicked with the lock held, do not recurse. */
if (!cam_periph_owned(periph) &&
(softc->flags & ADA_FLAG_OPEN)) {
- adadump(softc->disk, NULL, 0, 0, 0);
+ adadump(softc->disk, NULL, 0, 0);
}
continue;
}
diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c
index 886b3ca2329f..68743d621ad4 100644
--- a/sys/cam/mmc/mmc_da.c
+++ b/sys/cam/mmc/mmc_da.c
@@ -2005,8 +2005,7 @@ sddaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
}
static int
-sddadump(void *arg, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+sddadump(void *arg, void *virtual, off_t offset, size_t length)
{
struct ccb_mmcio mmcio;
struct disk *dp;
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index 84270143cbe6..76b6935d8690 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -499,7 +499,7 @@ ndastrategy(struct bio *bp)
}
static int
-ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+ndadump(void *arg, void *virtual, off_t offset, size_t length)
{
struct cam_periph *periph;
struct nda_softc *softc;
@@ -1324,7 +1324,7 @@ ndaflush(void)
*/
if (!cam_periph_owned(periph) &&
(softc->flags & NDA_FLAG_OPEN)) {
- ndadump(softc->disk, NULL, 0, 0, 0);
+ ndadump(softc->disk, NULL, 0, 0);
}
continue;
}
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index a8a7e34bf6f0..ae522405e293 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1911,7 +1911,7 @@ dastrategy(struct bio *bp)
}
static int
-dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+dadump(void *arg, void *virtual, off_t offset, size_t length)
{
struct cam_periph *periph;
struct da_softc *softc;
@@ -6251,7 +6251,7 @@ dashutdown(void * arg, int howto)
/* If we paniced with the lock held, do not recurse. */
if (!cam_periph_owned(periph) &&
(softc->flags & DA_FLAG_OPEN)) {
- dadump(softc->disk, NULL, 0, 0, 0);
+ dadump(softc->disk, NULL, 0, 0);
}
continue;
}
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 5eeb802b103d..4fcb5a0ad697 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -234,7 +234,7 @@ aac_dump_map_sg64(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
* Send out one command at a time with up to maxio of data.
*/
static int
-aac_disk_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+aac_disk_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct aac_disk *ad;
struct aac_softc *sc;
@@ -313,8 +313,8 @@ aac_disk_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size
if (aac_sync_fib(sc, command, 0, fib, size)) {
device_printf(sc->aac_dev,
- "Error dumping block 0x%jx\n",
- (uintmax_t)physical);
+ "Error dumping block to 0x%jx\n",
+ (uintmax_t)offset);
return (EIO);
}
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index db84f905ff50..227a8e1170eb 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -127,7 +127,7 @@ bad:
}
static int
-idad_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t length)
+idad_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct idad_softc *drv;
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 7ae489ea8201..493e28d21e92 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -39,8 +39,7 @@ static int ipsd_probe(device_t dev);
static int ipsd_attach(device_t dev);
static int ipsd_detach(device_t dev);
-static int ipsd_dump(void *arg, void *virtual, vm_offset_t physical,
- off_t offset, size_t length);
+static int ipsd_dump(void *arg, void *virtual, off_t offset, size_t length);
static void ipsd_dump_map_sg(void *arg, bus_dma_segment_t *segs, int nsegs,
int error);
static void ipsd_dump_block_complete(ips_command_t *command);
@@ -186,8 +185,7 @@ static int ipsd_detach(device_t dev)
}
static int
-ipsd_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+ipsd_dump(void *arg, void *virtual, off_t offset, size_t length)
{
ipsdisk_softc_t *dsc;
ips_softc_t *sc;
diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c
index 016d3f99e9ad..002fed7d2853 100644
--- a/sys/dev/mfi/mfi_disk.c
+++ b/sys/dev/mfi/mfi_disk.c
@@ -322,7 +322,7 @@ mfi_disk_complete(struct bio *bio)
}
static int
-mfi_disk_dump(void *arg, void *virt, vm_offset_t phys, off_t offset, size_t len)
+mfi_disk_dump(void *arg, void *virt, off_t offset, size_t len)
{
struct mfi_disk *sc;
struct mfi_softc *parent_sc;
diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c
index ba090e744ee1..f919a39b3587 100644
--- a/sys/dev/mfi/mfi_syspd.c
+++ b/sys/dev/mfi/mfi_syspd.c
@@ -266,8 +266,7 @@ mfi_syspd_strategy(struct bio *bio)
}
static int
-mfi_syspd_dump(void *arg, void *virt, vm_offset_t phys, off_t offset,
- size_t len)
+mfi_syspd_dump(void *arg, void *virt, off_t offset, size_t len)
{
struct mfi_system_pd *sc;
struct mfi_softc *parent_sc;
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index 5e821586f722..3f3c65289d48 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -173,8 +173,7 @@ static int mmcsd_shutdown(device_t dev);
/* disk routines */
static int mmcsd_close(struct disk *dp);
-static int mmcsd_dump(void *arg, void *virtual, vm_offset_t physical,
- off_t offset, size_t length);
+static int mmcsd_dump(void *arg, void *virtual, off_t offset, size_t length);
static int mmcsd_getattr(struct bio *);
static int mmcsd_ioctl_disk(struct disk *disk, u_long cmd, void *data,
int fflag, struct thread *td);
@@ -1378,8 +1377,7 @@ unpause:
}
static int
-mmcsd_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+mmcsd_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct bio bp;
daddr_t block, end;
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index ea44458885d2..e8fd115ec834 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -291,7 +291,7 @@ nvd_ioctl(struct disk *dp, u_long cmd, void *data, int fflag,
}
static int
-nvd_dump(void *arg, void *virt, vm_offset_t phys, off_t offset, size_t len)
+nvd_dump(void *arg, void *virt, off_t offset, size_t len)
{
struct disk *dp = arg;
struct nvd_disk *ndisk = dp->d_drv1;
diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c
index 8a5558f4571d..83f55fb1dc1f 100644
--- a/sys/dev/virtio/block/virtio_blk.c
+++ b/sys/dev/virtio/block/virtio_blk.c
@@ -133,7 +133,7 @@ static int vtblk_open(struct disk *);
static int vtblk_close(struct disk *);
static int vtblk_ioctl(struct disk *, u_long, void *, int,
struct thread *);
-static int vtblk_dump(void *, void *, vm_offset_t, off_t, size_t);
+static int vtblk_dump(void *, void *, off_t, size_t);
static void vtblk_strategy(struct bio *);
static int vtblk_negotiate_features(struct vtblk_softc *);
@@ -532,8 +532,7 @@ vtblk_ioctl(struct disk *dp, u_long cmd, void *addr, int flag,
}
static int
-vtblk_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+vtblk_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct disk *dp;
struct vtblk_softc *sc;
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index c9ee3b0e3dfb..6292dbaf7a1b 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -594,8 +594,7 @@ xbd_dump_complete(struct xbd_command *cm)
}
static int
-xbd_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+xbd_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct disk *dp = arg;
struct xbd_softc *sc = dp->d_drv1;
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 5e383cd35733..57208a0744db 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -130,8 +130,7 @@ g_nop_resize(struct g_consumer *cp)
}
static int
-g_nop_dumper(void *priv, void *virtual, vm_offset_t physical, off_t offset,
- size_t length)
+g_nop_dumper(void *priv, void *virtual, off_t offset, size_t length)
{
return (0);
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index d88f1fb316c8..0fb9813fbbab 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -1033,8 +1033,7 @@ g_raid_tr_kerneldump_common(struct g_raid_tr_object *tr,
}
static int
-g_raid_dump(void *arg,
- void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct g_raid_volume *vol;
int error;
@@ -1043,8 +1042,7 @@ g_raid_dump(void *arg,
G_RAID_DEBUG1(3, vol->v_softc, "Dumping at off %llu len %llu.",
(long long unsigned)offset, (long long unsigned)length);
- error = G_RAID_TR_KERNELDUMP(vol->v_tr,
- virtual, physical, offset, length);
+ error = G_RAID_TR_KERNELDUMP(vol->v_tr, virtual, offset, length);
return (error);
}
@@ -1397,7 +1395,7 @@ nodisk:
G_RAID_LOGREQ(3, bp, "Sending dumping request.");
if (bp->bio_cmd == BIO_WRITE) {
bp->bio_error = g_raid_subdisk_kerneldump(sd,
- bp->bio_data, 0, bp->bio_offset, bp->bio_length);
+ bp->bio_data, bp->bio_offset, bp->bio_length);
} else
bp->bio_error = EOPNOTSUPP;
g_raid_disk_done(bp);
@@ -1410,8 +1408,8 @@ nodisk:
}
int
-g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
- void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd, void *virtual,
+ off_t offset, size_t length)
{
if (sd->sd_disk == NULL)
@@ -1419,7 +1417,7 @@ g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
if (sd->sd_disk->d_kd.di.dumper == NULL)
return (EOPNOTSUPP);
return (dump_write(&sd->sd_disk->d_kd.di,
- virtual, physical,
+ virtual, 0,
sd->sd_disk->d_kd.di.mediaoffset + sd->sd_offset + offset,
length));
}
diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h
index eeaa8ac32508..720d588d9118 100644
--- a/sys/geom/raid/g_raid.h
+++ b/sys/geom/raid/g_raid.h
@@ -406,8 +406,8 @@ int g_raid_destroy_disk(struct g_raid_disk *disk);
void g_raid_iodone(struct bio *bp, int error);
void g_raid_subdisk_iostart(struct g_raid_subdisk *sd, struct bio *bp);
-int g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
- void *virtual, vm_offset_t physical, off_t offset, size_t length);
+int g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd, void *virtual,
+ off_t offset, size_t length);
struct g_consumer *g_raid_open_consumer(struct g_raid_softc *sc,
const char *name);
diff --git a/sys/geom/raid/g_raid_tr_if.m b/sys/geom/raid/g_raid_tr_if.m
index 193b4298691a..8de09ba1eb56 100644
--- a/sys/geom/raid/g_raid_tr_if.m
+++ b/sys/geom/raid/g_raid_tr_if.m
@@ -95,7 +95,6 @@ METHOD void iodone {
METHOD int kerneldump {
struct g_raid_tr_object *tr;
void *virtual;
- vm_offset_t physical;
off_t offset;
size_t length;
} DEFAULT g_raid_tr_kerneldump_common;
diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c
index dca728bf6dc4..a0a69502206f 100644
--- a/sys/geom/raid/tr_concat.c
+++ b/sys/geom/raid/tr_concat.c
@@ -286,8 +286,8 @@ failure:
}
static int
-g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr,
- void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual,
+ off_t boffset, size_t blength)
{
struct g_raid_volume *vol;
struct g_raid_subdisk *sd;
@@ -314,7 +314,7 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr,
sd = &vol->v_subdisks[no];
length = MIN(sd->sd_size - offset, remain);
error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no],
- addr, 0, offset, length);
+ addr, offset, length);
if (error != 0)
return (error);
remain -= length;
diff --git a/sys/geom/raid/tr_raid0.c b/sys/geom/raid/tr_raid0.c
index 22e2d6e1edda..43782a0956a2 100644
--- a/sys/geom/raid/tr_raid0.c
+++ b/sys/geom/raid/tr_raid0.c
@@ -269,7 +269,7 @@ failure:
static int
g_raid_tr_kerneldump_raid0(struct g_raid_tr_object *tr,
- void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+ void *virtual, off_t boffset, size_t blength)
{
struct g_raid_volume *vol;
char *addr;
@@ -296,8 +296,8 @@ g_raid_tr_kerneldump_raid0(struct g_raid_tr_object *tr,
do {
length = MIN(strip_size - start, remain);
- error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no],
- addr, 0, offset + start, length);
+ error = g_raid_subdisk_kerneldump(&vol->v_subdisks[no], addr,
+ offset + start, length);
if (error != 0)
return (error);
if (++no >= vol->v_disks_count) {
diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c
index 63bea0945c9c..7a6f76a3137d 100644
--- a/sys/geom/raid/tr_raid1.c
+++ b/sys/geom/raid/tr_raid1.c
@@ -899,8 +899,8 @@ rebuild_round_done:
}
static int
-g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr,
- void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr, void *virtual,
+ off_t offset, size_t length)
{
struct g_raid_volume *vol;
struct g_raid_subdisk *sd;
@@ -935,8 +935,7 @@ g_raid_tr_kerneldump_raid1(struct g_raid_tr_object *tr,
default:
continue;
}
- error = g_raid_subdisk_kerneldump(sd,
- virtual, physical, offset, length);
+ error = g_raid_subdisk_kerneldump(sd, virtual, offset, length);
if (error == 0)
ok++;
}
diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c
index 45a48acfd3b2..937d5ee8bb08 100644
--- a/sys/geom/raid/tr_raid1e.c
+++ b/sys/geom/raid/tr_raid1e.c
@@ -1144,8 +1144,8 @@ rebuild_round_done:
}
static int
-g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr,
- void *virtual, vm_offset_t physical, off_t boffset, size_t blength)
+g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr, void *virtual,
+ off_t boffset, size_t blength)
{
struct g_raid_volume *vol;
struct g_raid_subdisk *sd;
@@ -1177,8 +1177,8 @@ g_raid_tr_kerneldump_raid1e(struct g_raid_tr_object *tr,
default:
goto nextdisk;
}
- error = g_raid_subdisk_kerneldump(sd,
- addr, 0, offset + start, length);
+ error = g_raid_subdisk_kerneldump(sd, addr,
+ offset + start, length);
if (error != 0)
return (error);
nextdisk:
diff --git a/sys/geom/raid/tr_raid5.c b/sys/geom/raid/tr_raid5.c
index 431f9cad09de..5fa4edd49248 100644
--- a/sys/geom/raid/tr_raid5.c
+++ b/sys/geom/raid/tr_raid5.c
@@ -385,8 +385,8 @@ g_raid_tr_iodone_raid5(struct g_raid_tr_object *tr,
}
static int
-g_raid_tr_kerneldump_raid5(struct g_raid_tr_object *tr,
- void *virtual, vm_offset_t physical, off_t offset, size_t length)
+g_raid_tr_kerneldump_raid5(struct g_raid_tr_object *tr, void *virtual,
+ off_t offset, size_t length)
{
return (ENODEV);
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 0f31622903bf..d6053f24a746 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -1709,7 +1709,7 @@ dump_write(struct dumperinfo *di, void *virtual, vm_offset_t physical,
error = dump_check_bounds(di, offset, length);
if (error != 0)
return (error);
- return (di->dumper(di->priv, virtual, physical, offset, length));
+ return (di->dumper(di->priv, virtual, offset, length));
}
/*
diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c
index cd20f4f2fab4..26154af20372 100644
--- a/sys/kern/kern_vnodedumper.c
+++ b/sys/kern/kern_vnodedumper.c
@@ -150,7 +150,6 @@ vnode_dumper_start(struct dumperinfo *di, void *key, uint32_t keysize)
* Parameters:
* arg Opaque private pointer to vnode
* virtual Virtual address (where to read the data from)
- * physical Physical memory address (unused)
* offset Offset from start of core file
* length Data length
*
@@ -159,8 +158,7 @@ vnode_dumper_start(struct dumperinfo *di, void *key, uint32_t keysize)
* errno on error
*/
int
-vnode_dump(void *arg, void *virtual, vm_offset_t physical __unused,
- off_t offset, size_t length)
+vnode_dump(void *arg, void *virtual, off_t offset, size_t length)
{
struct vnode *vp;
int error = 0;
diff --git a/sys/netinet/netdump/netdump_client.c b/sys/netinet/netdump/netdump_client.c
index 4b1682bc8459..8210a48046e2 100644
--- a/sys/netinet/netdump/netdump_client.c
+++ b/sys/netinet/netdump/netdump_client.c
@@ -89,7 +89,7 @@ static void netdump_cleanup(void);
static int netdump_configure(struct diocskerneldump_arg *,
struct thread *);
static int netdump_dumper(void *priv __unused, void *virtual,
- vm_offset_t physical __unused, off_t offset, size_t length);
+ off_t offset, size_t length);
static bool netdump_enabled(void);
static int netdump_enabled_sysctl(SYSCTL_HANDLER_ARGS);
static int netdump_ioctl(struct cdev *dev __unused, u_long cmd,
@@ -227,7 +227,6 @@ netdump_flush_buf(void)
* Parameters:
* priv Unused. Optional private pointer.
* virtual Virtual address (where to read the data from)
- * physical Unused. Physical memory address.
* offset Offset from start of core file
* length Data length
*
@@ -236,8 +235,7 @@ netdump_flush_buf(void)
* errno on error
*/
static int
-netdump_dumper(void *priv __unused, void *virtual,
- vm_offset_t physical __unused, off_t offset, size_t length)
+netdump_dumper(void *priv __unused, void *virtual, off_t offset, size_t length)
{
int error;
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 02671a065c09..37265c6988ce 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -130,7 +130,6 @@ typedef void d_purge_t(struct cdev *dev);
typedef int dumper_t(
void *_priv, /* Private to the driver. */
void *_virtual, /* Virtual (mapped) address. */
- vm_offset_t _physical, /* Physical address of virtual. */
off_t _offset, /* Byte-offset to write at. */
size_t _length); /* Number of bytes to dump. */
typedef int dumper_start_t(struct dumperinfo *di, void *key, uint32_t keysize);