Module Name: src
Committed By: uebayasi
Date: Tue Jul 27 00:50:31 UTC 2010
Modified Files:
src/sys/sys [uebayasi-xip]: dkio.h
src/sys/ufs/ffs [uebayasi-xip]: ffs_vfsops.c
Log Message:
s/DIOCGPHYSADDR/DIOCGPHYSSEG/ now that it returns struct vm_physseg *,
not paddr_t.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.4 -r1.15.2.5 src/sys/sys/dkio.h
cvs rdiff -u -r1.257.2.6 -r1.257.2.7 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/dkio.h
diff -u src/sys/sys/dkio.h:1.15.2.4 src/sys/sys/dkio.h:1.15.2.5
--- src/sys/sys/dkio.h:1.15.2.4 Fri May 28 09:13:37 2010
+++ src/sys/sys/dkio.h Tue Jul 27 00:50:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dkio.h,v 1.15.2.4 2010/05/28 09:13:37 uebayasi Exp $ */
+/* $NetBSD: dkio.h,v 1.15.2.5 2010/07/27 00:50:30 uebayasi Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -109,6 +109,6 @@
#define DIOCTUR _IOR('d', 128, int) /* test unit ready */
/* get physical address cookie if directly memory-mappable (XIP) */
-#define DIOCGPHYSADDR _IOR('d', 129, paddr_t)
+#define DIOCGPHYSSEG _IOR('d', 129, void *)
#endif /* _SYS_DKIO_H_ */
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.6 src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.7
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.6 Fri May 28 09:14:55 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Tue Jul 27 00:50:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257.2.6 2010/05/28 09:14:55 uebayasi Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.257.2.7 2010/07/27 00:50:31 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.6 2010/05/28 09:14:55 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.7 2010/07/27 00:50:31 uebayasi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1175,13 +1175,13 @@
else {
void *physseg = NULL;
- if ((VOP_IOCTL(devvp, DIOCGPHYSADDR, &physseg, FREAD,
+ if ((VOP_IOCTL(devvp, DIOCGPHYSSEG, &physseg, FREAD,
cred) == 0) &&
physseg != NULL) {
mp->mnt_iflag |= IMNT_XIP;
devvp->v_physseg = physseg;
} else
- printf("device doesn't support DIOCGPHYSADDR\n");
+ printf("device doesn't support DIOCGPHYSSEG\n");
}
#endif
#ifdef FFS_EI
