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

From: Betty Dall
Date: Fri Apr 27 2012 - 16:41:19 EST


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@xxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/