[src/trunk]: src/sys switch ARM to use same minor for /dev/zero as other archs

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

details:   https://anonhg.NetBSD.org/src/rev/719e3f0cf74e
branches:  trunk
changeset: 553431:719e3f0cf74e
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Oct 16 12:02:58 2003 +0000

description:
switch ARM to use same minor for /dev/zero as other archs
as discussed on tech-arm@

diffstat:

 sys/arch/acorn26/acorn26/mem.c |   9 +++++++--
 sys/arch/arm/arm32/mem.c       |   9 +++++++--
 sys/sys/conf.h                 |  11 +++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r eaadf9991d0c -r 719e3f0cf74e sys/arch/acorn26/acorn26/mem.c
--- a/sys/arch/acorn26/acorn26/mem.c    Thu Oct 16 10:57:35 2003 +0000
+++ b/sys/arch/acorn26/acorn26/mem.c    Thu Oct 16 12:02:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.6 2003/08/07 16:26:28 agc Exp $      */
+/*     $NetBSD: mem.c,v 1.7 2003/10/16 12:02:58 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -72,8 +72,10 @@
  * Memory special file
  */
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.6 2003/08/07 16:26:28 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.7 2003/10/16 12:02:58 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -161,6 +163,9 @@
                                uio->uio_resid = 0;
                        return (0);
 
+#ifdef COMPAT_16
+               case _DEV_ZERO_oARM:
+#endif
                case DEV_ZERO:
                        if (uio->uio_rw == UIO_WRITE) {
                                uio->uio_resid = 0;
diff -r eaadf9991d0c -r 719e3f0cf74e sys/arch/arm/arm32/mem.c
--- a/sys/arch/arm/arm32/mem.c  Thu Oct 16 10:57:35 2003 +0000
+++ b/sys/arch/arm/arm32/mem.c  Thu Oct 16 12:02:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.10 2003/08/07 16:26:52 agc Exp $     */
+/*     $NetBSD: mem.c,v 1.11 2003/10/16 12:02:58 jdolecek Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -72,8 +72,10 @@
  * Memory special file
  */
 
+#include "opt_compat_netbsd.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.10 2003/08/07 16:26:52 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.11 2003/10/16 12:02:58 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -165,6 +167,9 @@
                                uio->uio_resid = 0;
                        return (0);
 
+#ifdef COMPAT_16
+               case _DEV_ZERO_oARM:
+#endif
                case DEV_ZERO:
                        if (uio->uio_rw == UIO_WRITE) {
                                uio->uio_resid = 0;
diff -r eaadf9991d0c -r 719e3f0cf74e sys/sys/conf.h
--- a/sys/sys/conf.h    Thu Oct 16 10:57:35 2003 +0000
+++ b/sys/sys/conf.h    Thu Oct 16 12:02:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.h,v 1.113 2003/10/11 18:32:53 jdolecek Exp $      */
+/*     $NetBSD: conf.h,v 1.114 2003/10/16 12:02:58 jdolecek Exp $      */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -184,12 +184,11 @@
 
 #define        DEV_MEM         0       /* minor device 0 is physical memory */
 #define        DEV_KMEM        1       /* minor device 1 is kernel memory */
-#define DEV_NULL       2       /* minor device 2 is EOF/rathole */
-#ifdef __arm__                 /* XXX: FIX ME ARM! */
-#define DEV_ZERO       3       /* minor device 3 is '\0'/rathole */
-#else
-#define DEV_ZERO       12      /* minor device 12 is '\0'/rathole */
+#define        DEV_NULL        2       /* minor device 2 is EOF/rathole */
+#ifdef COMPAT_16
+#define        _DEV_ZERO_oARM  3       /* reserved: old ARM /dev/zero minor */
 #endif
+#define        DEV_ZERO        12      /* minor device 12 is '\0'/rathole */
 
 #endif /* _KERNEL */