Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename the intr_depth field of struct intrframe to avoid a name conflict 

in MULTIPROCESSOR builds.
This commit is contained in:
chs 2002-07-24 05:44:37 +00:00
parent 40fa5f20fe
commit 185a5bbcf0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/powerpc/include/frame.h
View File

@ -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 @@ struct intrframe {
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 */

4
sys/arch/powerpc/mpc6xx/genassym.cf
View File

@ -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_R1 offsetof(struct intrframe, r1)
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)