git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung into...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
mach_traps.h
diff --git
a/arch/x86/include/asm/mach_traps.h
b/arch/x86/include/asm/mach_traps.h
index
72a8b52
..
a01e7ec
100644
(file)
--- a/
arch/x86/include/asm/mach_traps.h
+++ b/
arch/x86/include/asm/mach_traps.h
@@
-17,7
+17,7
@@
#define NMI_REASON_CLEAR_IOCHK 0x08
#define NMI_REASON_CLEAR_MASK 0x0f
#define NMI_REASON_CLEAR_IOCHK 0x08
#define NMI_REASON_CLEAR_MASK 0x0f
-static inline unsigned char get_nmi_reason(void)
+static inline unsigned char
default_
get_nmi_reason(void)
{
return inb(NMI_REASON_PORT);
}
{
return inb(NMI_REASON_PORT);
}