---

yaml --- r: 302734 b: refs/heads/master c: 6ff968c h: refs/heads/master v: v3
git-mirror · May 7, 2012 · d1fd47c · d1fd47c
1 parent 578e490
commit d1fd47c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72b3fb24713755cf9740b403e95aa67ceedf3509
+refs/heads/master: 6ff968cca1dfebd4b6fcade87c11658dbfc96932
diff --git a/trunk/arch/x86/include/asm/nmi.h b/trunk/arch/x86/include/asm/nmi.h
@@ -40,7 +40,7 @@ typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
 struct nmiaction {
 	struct list_head	list;
 	nmi_handler_t		handler;
-	unsigned int		flags;
+	unsigned long		flags;
 	const char		*name;
 };