Module Name: src
Committed By: christos
Date: Sat Sep 26 04:13:39 UTC 2015
Modified Files:
src/sys/compat/sunos: sunos_ioctl.c
src/sys/compat/sunos32: sunos32_ioctl.c
Log Message:
rename sun ioctls
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/compat/sunos/sunos_ioctl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/sunos32/sunos32_ioctl.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/compat/sunos/sunos_ioctl.c
diff -u src/sys/compat/sunos/sunos_ioctl.c:1.62 src/sys/compat/sunos/sunos_ioctl.c:1.63
--- src/sys/compat/sunos/sunos_ioctl.c:1.62 Fri Sep 5 05:21:55 2014
+++ src/sys/compat/sunos/sunos_ioctl.c Sat Sep 26 00:13:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_ioctl.c,v 1.62 2014/09/05 09:21:55 matt Exp $ */
+/* $NetBSD: sunos_ioctl.c,v 1.63 2015/09/26 04:13:39 christos Exp $ */
/*
* Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.62 2014/09/05 09:21:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.63 2015/09/26 04:13:39 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -840,7 +840,7 @@ sunos_sys_ioctl(struct lwp *l, const str
* (which was from the old sparc/scsi/sun_disklabel.c), and
* modified to suite.
*/
- case DKIOCGGEOM:
+ case SUN_DKIOCGGEOM:
{
struct disklabel dl;
@@ -863,12 +863,12 @@ sunos_sys_ioctl(struct lwp *l, const str
break;
}
- case DKIOCINFO:
+ case SUN_DKIOCINFO:
/* Homey don't do DKIOCINFO */
memset(SCARG(uap, data), 0, sizeof(struct sun_dkctlr));
break;
- case DKIOCGPART:
+ case SUN_DKIOCGPART:
{
struct partinfo pi;
Index: src/sys/compat/sunos32/sunos32_ioctl.c
diff -u src/sys/compat/sunos32/sunos32_ioctl.c:1.31 src/sys/compat/sunos32/sunos32_ioctl.c:1.32
--- src/sys/compat/sunos32/sunos32_ioctl.c:1.31 Fri Sep 5 18:37:09 2014
+++ src/sys/compat/sunos32/sunos32_ioctl.c Sat Sep 26 00:13:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_ioctl.c,v 1.31 2014/09/05 22:37:09 nakayama Exp $ */
+/* $NetBSD: sunos32_ioctl.c,v 1.32 2015/09/26 04:13:39 christos Exp $ */
/* from: NetBSD: sunos_ioctl.c,v 1.35 2001/02/03 22:20:02 mrg Exp */
/*
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.31 2014/09/05 22:37:09 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.32 2015/09/26 04:13:39 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd32.h"
@@ -866,7 +866,7 @@ sunos32_sys_ioctl(struct lwp *l, const s
* (which was from the old sparc/scsi/sun_disklabel.c), and
* modified to suite.
*/
- case DKIOCGGEOM:
+ case SUN_DKIOCGGEOM:
{
struct disklabel dl;
@@ -890,13 +890,13 @@ sunos32_sys_ioctl(struct lwp *l, const s
break;
}
- case DKIOCINFO:
+ case SUN_DKIOCINFO:
/* Homey don't do DKIOCINFO */
/* XXX can't do memset() on a user address (dsl) */
memset(SCARG_P32(uap, data), 0, sizeof(struct sun_dkctlr));
break;
- case DKIOCGPART:
+ case SUN_DKIOCGPART:
{
struct partinfo pi;
