[src/trunk]: src/sys/arch/powerpc rename the intr_depth field of struct intrf...

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

details:   https://anonhg.NetBSD.org/src/rev/ebcfb030ace9
branches:  trunk
changeset: 534393:ebcfb030ace9
user:      chs <chs%NetBSD.org@localhost>
date:      Wed Jul 24 05:44:37 2002 +0000

description:
rename the intr_depth field of struct intrframe to avoid a name conflict
in MULTIPROCESSOR builds.

diffstat:

 sys/arch/powerpc/include/frame.h    |  4 ++--
 sys/arch/powerpc/mpc6xx/genassym.cf |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r acd5369d6785 -r ebcfb030ace9 sys/arch/powerpc/include/frame.h
--- a/sys/arch/powerpc/include/frame.h  Wed Jul 24 05:10:14 2002 +0000
+++ b/sys/arch/powerpc/include/frame.h  Wed Jul 24 05:44:37 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.6 2002/07/18 22:51:57 matt Exp $   */
+/*     $NetBSD: frame.h,v 1.7 2002/07/24 05:44:38 chs Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -101,7 +101,7 @@
        register_t srr1;                /*  8 */
        register_t srr0;                /* 12 */
        int pri;                        /* 16 */
-       int intr_depth;                 /* 20 */
+       int intrdepth;                  /* 20 */
        register_t vrsave;              /* 24 */
        register_t ctr;                 /* 28 */
        register_t xer;                 /* 32 */
diff -r acd5369d6785 -r ebcfb030ace9 sys/arch/powerpc/mpc6xx/genassym.cf
--- a/sys/arch/powerpc/mpc6xx/genassym.cf       Wed Jul 24 05:10:14 2002 +0000
+++ b/sys/arch/powerpc/mpc6xx/genassym.cf       Wed Jul 24 05:44:37 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.4 2002/07/05 18:45:22 matt Exp $
+#      $NetBSD: genassym.cf,v 1.5 2002/07/24 05:44:37 chs Exp $
 
 #
 # Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -63,7 +63,7 @@
 define IFRAME_SRR1             offsetof(struct intrframe, srr1)
 define IFRAME_SRR0             offsetof(struct intrframe, srr0)
 define IFRAME_PRI              offsetof(struct intrframe, pri)
-define IFRAME_INTR_DEPTH       offsetof(struct intrframe, intr_depth)
+define IFRAME_INTR_DEPTH       offsetof(struct intrframe, intrdepth)
 define IFRAME_VRSAVE           offsetof(struct intrframe, vrsave)
 define IFRAME_CTR              offsetof(struct intrframe, ctr)
 define IFRAME_XER              offsetof(struct intrframe, xer)