summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/uv/uv_hub.h
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2011-05-09 20:35:19 +0400
committerIngo Molnar <mingo@elte.hu>2011-05-10 11:26:55 +0400
commit1d44e8288a0557c28c447d7e511f50d06ff93a34 (patch)
treefbda66cbc2a229e236a6fa439b57b233b6397d97 /arch/x86/include/asm/uv/uv_hub.h
parent693d92a1bbc9e42681c42ed190bd42b636ca876f (diff)
downloadlinux-1d44e8288a0557c28c447d7e511f50d06ff93a34.tar.xz
x86, UV: Fix NMI handler for UV platforms
This fixes problems seen on UV systems handling NMIs from the node controller. I isolated the "dazed..." messages that I saw earlier to a bug in the BMC on our platform. It was sending NMIs w/o properly setting a register that indicated the source of NMI. So rather than _assuming_ any unhandled NMI came from the UV system maintenance console (SMC), add a check to verify that the SMC actually sent the NMI. Signed-off-by: Jack Steiner <steiner@sgi.com> Cc: gorcunov@gmail.com Cc: dzickus@redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/uv/uv_hub.h')
-rw-r--r--arch/x86/include/asm/uv/uv_hub.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index a501741c2335..4298002d0c83 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -398,6 +398,8 @@ struct uv_blade_info {
unsigned short nr_online_cpus;
unsigned short pnode;
short memory_nid;
+ spinlock_t nmi_lock;
+ unsigned long nmi_count;
};
extern struct uv_blade_info *uv_blade_info;
extern short *uv_node_to_blade;