summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/subr_disk.c6
-rw-r--r--sys/sys/disk.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 088ec406203..54d4d0e8189 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.123 2011/06/03 21:14:11 matthew Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.124 2011/06/19 04:11:48 matthew Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -784,7 +784,7 @@ disk_init(void)
}
int
-disk_construct(struct disk *diskp, char *lockname)
+disk_construct(struct disk *diskp)
{
rw_init(&diskp->dk_lock, "dklk");
mtx_init(&diskp->dk_mtx, IPL_BIO);
@@ -803,7 +803,7 @@ disk_attach(struct device *dv, struct disk *diskp)
int majdev;
if (!ISSET(diskp->dk_flags, DKF_CONSTRUCTED))
- disk_construct(diskp, diskp->dk_name);
+ disk_construct(diskp);
/*
* Allocate and initialize the disklabel structures. Note that
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index d3504c3e011..41a1ca957d7 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.28 2010/11/17 15:01:05 bluhm Exp $ */
+/* $OpenBSD: disk.h,v 1.29 2011/06/19 04:11:48 matthew Exp $ */
/* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */
/*
@@ -151,7 +151,7 @@ extern int disk_count; /* number of disks in global disklist */
extern int disk_change; /* disk attached/detached */
void disk_init(void);
-int disk_construct(struct disk *, char *);
+int disk_construct(struct disk *);
void disk_attach(struct device *, struct disk *);
void disk_detach(struct disk *);
void disk_busy(struct disk *);