Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/include/intr.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/include/intr.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -p -r1.28.2.1 -r1.28.2.2
--- src/sys/arch/x86/include/intr.h	2007/12/08 18:18:09	1.28.2.1
+++ src/sys/arch/x86/include/intr.h	2008/02/18 21:05:16	1.28.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.28.2.1 2007/12/08 18:18:09 mjf Exp $	*/
+/*	$NetBSD: intr.h,v 1.28.2.2 2008/02/18 21:05:16 mjf Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2006, 2007 The NetBSD Foundation, Inc.
@@ -162,11 +162,12 @@ extern struct intrstub ioapic_level_stub
 
 struct cpu_info;
 
-extern char idt_allocmap[];
-
 struct pcibus_attach_args;
 
 void intr_default_setup(void);
+void *nmi_establish(int (*)(void *), void *);
+bool nmi_disestablish(void *);
+int nmi_dispatch(void);
 int x86_nmi(void);
 void intr_calculatemasks(struct cpu_info *);
 int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *);