diff --git a/sys/arch/ofppc/include/cpu.h b/sys/arch/ofppc/include/cpu.h index 5172923444bc..01aba4ce6f39 100644 --- a/sys/arch/ofppc/include/cpu.h +++ b/sys/arch/ofppc/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.13 2001/01/14 02:00:41 thorpej Exp $ */ +/* $NetBSD: cpu.h,v 1.14 2001/04/12 19:43:46 thorpej Exp $ */ /* * Copyright (C) 1995-1997 Wolfgang Solfrank. @@ -60,7 +60,7 @@ struct machvec { int (*splbio) __P((void)); int (*splnet) __P((void)); int (*spltty) __P((void)); - int (*splimp) __P((void)); + int (*splvm) __P((void)); int (*splclock) __P((void)); int (*spllowersoftclock) __P((void)); int (*splsoftclock) __P((void)); @@ -80,8 +80,8 @@ extern struct machvec machine_interface; #define splbio() ((*machine_interface.splbio)()) #define splnet() ((*machine_interface.splnet)()) #define spltty() ((*machine_interface.spltty)()) -#define splimp() ((*machine_interface.splimp)()) -#define splvm() ((*machine_interface.splimp)()) +#define splimp() ((*machine_interface.splvm)()) +#define splvm() ((*machine_interface.splvm)()) #define splclock() ((*machine_interface.splclock)()) #define spllowersoftclock() ((*machine_interface.spllowersoftclock)()) #define splsoftclock() ((*machine_interface.splsoftclock)()) diff --git a/sys/arch/ofppc/ofppc/soft_spl.c b/sys/arch/ofppc/ofppc/soft_spl.c index e23f20f8eb7d..9da950033d40 100644 --- a/sys/arch/ofppc/ofppc/soft_spl.c +++ b/sys/arch/ofppc/ofppc/soft_spl.c @@ -1,4 +1,4 @@ -/* $NetBSD: soft_spl.c,v 1.3 2001/01/15 20:19:56 thorpej Exp $ */ +/* $NetBSD: soft_spl.c,v 1.4 2001/04/12 19:43:47 thorpej Exp $ */ /* * Copyright (C) 1997 Wolfgang Solfrank. @@ -38,7 +38,7 @@ static int soft_spl0 __P((void)); static int soft_splbio __P((void)); static int soft_splnet __P((void)); static int soft_spltty __P((void)); -static int soft_splimp __P((void)); +static int soft_splvm __P((void)); static int soft_splclock __P((void)); static int soft_spllowersoftclock __P((void)); static int soft_splsoftclock __P((void)); @@ -55,7 +55,7 @@ struct machvec soft_machvec = { soft_splbio, soft_splnet, soft_spltty, - soft_splimp, + soft_splvm, soft_splclock, soft_spllowersoftclock, soft_splsoftclock, @@ -181,7 +181,7 @@ soft_spltty() } static int -soft_splimp() +soft_splvm() { return splraise(SPLIMP | SPLSOFTCLOCK | SPLSOFTNET); }