[PATCH v2] x86,nmi: Fix the type of nmiaction.flags field

[PATCH v2] x86,nmi: Fix the type of nmiaction.flags field

[Betty Dall]

This patch changes the type of the struct nmiaction flags field to
unsigned long from unsigned int. All the usages of the flags field
are unsigned long already. There is only one flag used currently,
NMI_FLAG_FIRST, but having the wrong size could cause a truncation
bug in the future on 64 bit architectures.

v1->v2: The structure moved from nmi.c to nmi.h in the tip git tree
so I am anticipating a merge conflict with the first patch sent by
Don Zickus.

Signed-off-by: Betty Dall <betty.dall@hp.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
---
 arch/x86/include/asm/nmi.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index a1a836c..0e3793b 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/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;
 };
 
-- 
1.7.5.4

[tip:core/locking] x86/nmi: Fix the type of the nmiaction. flags field

[tip-bot for Betty Dall]

Commit-ID:  6ff968cca1dfebd4b6fcade87c11658dbfc96932
Gitweb:     http://git.kernel.org/tip/6ff968cca1dfebd4b6fcade87c11658dbfc96932
Author:     Betty Dall <betty.dall@hp.com>
AuthorDate: Fri, 27 Apr 2012 14:40:55 -0600
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 7 May 2012 12:32:11 +0200

x86/nmi: Fix the type of the nmiaction.flags field

This patch changes the type of the struct nmiaction flags field
to unsigned long from unsigned int. All the usages of the flags
field are unsigned long already. There is only one flag used
currently, NMI_FLAG_FIRST, but having the wrong size could cause
a truncation bug in the future on 64 bit architectures.

Signed-off-by: Betty Dall <betty.dall@hp.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/1335559255-13454-1-git-send-email-betty.dall@hp.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/nmi.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index a1a836c..0e3793b 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/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;
 };