diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-08-20 09:16:46 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-08-20 09:16:46 +0000 |
| commit | 2aae25b87d9c3a273c7978ae829595c27642e1f5 (patch) | |
| tree | 102f954b556240ceeee78760c967f1d3044085d6 /sys/i386/include/cpufunc.h | |
| parent | a6ed34cafa09e22284b6ade10076622c9328036f (diff) | |
| download | FreeBSD-src-2aae25b87d9c3a273c7978ae829595c27642e1f5.zip FreeBSD-src-2aae25b87d9c3a273c7978ae829595c27642e1f5.tar.gz | |
- clean up interrupt handling for xen a tiny bit
- parse the command line in to kenv
- defer shutdown watcher until later in boot
MFC after: 1 month
Diffstat (limited to 'sys/i386/include/cpufunc.h')
| -rw-r--r-- | sys/i386/include/cpufunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 948bde1..5f28a86 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -48,7 +48,7 @@ extern void xen_sti(void); extern void xen_load_cr3(u_int data); extern void xen_tlb_flush(void); extern void xen_invlpg(u_int addr); -extern void xen_save_and_cli(u_int *eflags); +extern int xen_save_and_cli(void); extern void xen_restore_flags(u_int eflags); #endif @@ -690,10 +690,10 @@ load_dr7(u_int dr7) static __inline register_t intr_disable(void) { - register_t eflags = 0; + register_t eflags; #ifdef XEN - xen_save_and_cli(&eflags); + eflags = xen_save_and_cli(); #else eflags = read_eflags(); disable_intr(); |
