diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 18:50:23 +0000 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2009-04-02 13:55:18 -0700 |
| commit | 4a78cb55e52d24c37126f456a710c7d6b9babbb4 (patch) | |
| tree | d0e81a148b9d3ff083eb7a9252bb53f0ddd83a7b /arch | |
| parent | e1b427acc979431fc7f57a06d0c636c542fdffcc (diff) | |
x86, uv: fix cpumask iterator in uv_bau_init()
upstream commit: 2c74d66624ddbda8101d54d1e184cf9229b378bc
Impact: fix boot crash on UV systems
Commit 76ba0ecda0de9accea9a91cb6dbde46782110e1c "cpumask: use
cpumask_var_t in uv_flush_tlb_others" used cur_cpu as an iterator;
it was supposed to be zero for the code below it.
Reported-by: Cliff Wickman <cpw@sgi.com>
Original-From: Cliff Wickman <cpw@sgi.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Mike Travis <travis@sgi.com>
Cc: steiner@sgi.com
Cc: <stable@kernel.org>
LKML-Reference: <200903180822.31196.rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/tlb_uv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index 6812b829ed83..16e505a4c303 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c @@ -742,7 +742,7 @@ static int __init uv_bau_init(void) int node; int nblades; int last_blade; - int cur_cpu = 0; + int cur_cpu; if (!is_uv_system()) return 0; @@ -752,6 +752,7 @@ static int __init uv_bau_init(void) uv_mmask = (1UL << uv_hub_info->n_val) - 1; nblades = 0; last_blade = -1; + cur_cpu = 0; for_each_online_node(node) { blade = uv_node_to_blade_id(node); if (blade == last_blade) |