[src/uebayasi-xip]: src/sys s/DIOCGPHYSADDR/DIOCGPHYSSEG/ now that it returns...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b7de109b5fd
branches:  uebayasi-xip
changeset: 751752:3b7de109b5fd
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Jul 27 00:50:30 2010 +0000

description:
s/DIOCGPHYSADDR/DIOCGPHYSSEG/ now that it returns struct vm_physseg *,
not paddr_t.

diffstat:

 sys/dev/flash.c          |  4 ++--
 sys/sys/dkio.h           |  4 ++--
 sys/ufs/ffs/ffs_vfsops.c |  8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 9ffad6c92cc3 -r 3b7de109b5fd sys/dev/flash.c
--- a/sys/dev/flash.c   Mon Jul 26 10:11:38 2010 +0000
+++ b/sys/dev/flash.c   Tue Jul 27 00:50:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $Id: flash.c,v 1.1.2.10 2010/07/26 10:11:38 uebayasi Exp $      */
+/*     $Id: flash.c,v 1.1.2.11 2010/07/27 01:16:21 uebayasi Exp $      */
 
 /*-
  * Copyright (c) 2010 Tsubai Masanari.  All rights reserved.
@@ -96,7 +96,7 @@
 
        switch (cmd) {
 #ifdef XIP
-       case DIOCGPHYSADDR:
+       case DIOCGPHYSSEG:
                if (sc->sc_addr == 0)
                        error = EINVAL;
                else
diff -r 9ffad6c92cc3 -r 3b7de109b5fd sys/sys/dkio.h
--- a/sys/sys/dkio.h    Mon Jul 26 10:11:38 2010 +0000
+++ b/sys/sys/dkio.h    Tue Jul 27 00:50:30 2010 +0000
@@ -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_ */
diff -r 9ffad6c92cc3 -r 3b7de109b5fd sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Jul 26 10:11:38 2010 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Tue Jul 27 00:50:30 2010 +0000
@@ -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