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

Move the disable_intr and enable_intr functions from xenfunc.h to cpufunc.h,

Browse Source 
because the x86/intr.h needs them and does not include xenfunc.h. Including
xenfunc.h in cpufunc.h is a clear lose because xenfunc.h needs a boatload
of include functions in order to compile.
This commit is contained in:
christos 2004-12-10 18:47:52 +00:00
parent cb9ebec1e2
commit 174c6b074b
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/xen/include/cpufunc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpufunc.h,v 1.3 2004/05/07 14:01:33 cl Exp $ */ /* $NetBSD: cpufunc.h,v 1.4 2004/12/10 18:47:52 christos Exp $ */
/* NetBSD: cpufunc.h,v 1.28 2004/01/14 11:31:55 yamt Exp */ /* NetBSD: cpufunc.h,v 1.28 2004/01/14 11:31:55 yamt Exp */
/*- /*-
@ -48,6 +48,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <machine/specialreg.h> #include <machine/specialreg.h>
#include <machine/xen.h>
#include <machine/hypervisor.h>
static __inline void static __inline void
x86_pause(void) x86_pause(void)
@ -221,19 +223,17 @@ ldr6(u_int val)
/* XXXX ought to be in psl.h with spl() functions */ /* XXXX ought to be in psl.h with spl() functions */
#if 0
static __inline void static __inline void
disable_intr(void) disable_intr(void)
{ {
__asm __volatile("cli"); __cli();
} }
static __inline void static __inline void
enable_intr(void) enable_intr(void)
{ {
__asm __volatile("sti"); __sti();
} }
#endif
static __inline u_long static __inline u_long
read_eflags(void) read_eflags(void)

14
sys/arch/xen/include/xenfunc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: xenfunc.h,v 1.2 2004/05/07 14:01:33 cl Exp $ */ /* $NetBSD: xenfunc.h,v 1.3 2004/12/10 18:47:52 christos Exp $ */
/* /*
* *
@ -119,16 +119,4 @@ ldr6(u_int val)
HYPERVISOR_set_debugreg(6, val); HYPERVISOR_set_debugreg(6, val);
} }
static __inline void
disable_intr(void)
{
__cli();
}
static __inline void
enable_intr(void)
{
__sti();
}
#endif /* _XEN_XENFUNC_H_ */ #endif /* _XEN_XENFUNC_H_ */