From d1fd47cb4ef62c51c8535416ee86deea34eecbd2 Mon Sep 17 00:00:00 2001
From: Betty Dall <betty.dall@hp.com>
Date: Fri, 27 Apr 2012 14:40:55 -0600
Subject: [PATCH] --- yaml --- r: 302734 b: refs/heads/master c:
 6ff968cca1dfebd4b6fcade87c11658dbfc96932 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/nmi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 81423b7c7bc7..6a0364b078b2 100644
--- 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
index a1a836c8131c..0e3793b821ef 100644
--- 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;
 };