diff options
author | Cliff Wickman <cpw@sgi.com> | 2008-12-31 14:20:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 11:26:25 -0500 |
commit | 46814dded1b972a07b1609d81632eef3009fbb10 (patch) | |
tree | be7b73a1c90b0c206e1de5ff90a095c71c242069 /arch/x86/kernel/tlb_uv.c | |
parent | 26799a63110dcbe81291ea53178f6b4810d07424 (diff) |
x86, UV: remove erroneous BAU initialization
Impact: fix crash on x86/UV
UV is the SGI "UltraViolet" machine, which is x86_64 based.
BAU is the "Broadcast Assist Unit", used for TLB shootdown in UV.
This patch removes the allocation and initialization of an unused table.
This table is left over from a development test mode. It is unused in
the present code.
And it was incorrectly initialized: 8 entries allocated but 17 initialized,
causing slab corruption.
This patch should go into 2.6.27 and 2.6.28 as well as the current tree.
Diffed against 2.6.28 (linux-next, 12/30/08)
Signed-off-by: Cliff Wickman <cpw@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/tlb_uv.c')
-rw-r--r-- | arch/x86/kernel/tlb_uv.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index 6a00e5faaa74..f885023167e0 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c | |||
@@ -582,7 +582,6 @@ static int __init uv_ptc_init(void) | |||
582 | static struct bau_control * __init uv_table_bases_init(int blade, int node) | 582 | static struct bau_control * __init uv_table_bases_init(int blade, int node) |
583 | { | 583 | { |
584 | int i; | 584 | int i; |
585 | int *ip; | ||
586 | struct bau_msg_status *msp; | 585 | struct bau_msg_status *msp; |
587 | struct bau_control *bau_tabp; | 586 | struct bau_control *bau_tabp; |
588 | 587 | ||
@@ -599,13 +598,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node) | |||
599 | bau_cpubits_clear(&msp->seen_by, (int) | 598 | bau_cpubits_clear(&msp->seen_by, (int) |
600 | uv_blade_nr_possible_cpus(blade)); | 599 | uv_blade_nr_possible_cpus(blade)); |
601 | 600 | ||
602 | bau_tabp->watching = | ||
603 | kmalloc_node(sizeof(int) * DEST_NUM_RESOURCES, GFP_KERNEL, node); | ||
604 | BUG_ON(!bau_tabp->watching); | ||
605 | |||
606 | for (i = 0, ip = bau_tabp->watching; i < DEST_Q_SIZE; i++, ip++) | ||
607 | *ip = 0; | ||
608 | |||
609 | uv_bau_table_bases[blade] = bau_tabp; | 601 | uv_bau_table_bases[blade] = bau_tabp; |
610 | 602 | ||
611 | return bau_tabp; | 603 | return bau_tabp; |
@@ -628,7 +620,6 @@ uv_table_bases_finish(int blade, int node, int cur_cpu, | |||
628 | bcp->bau_msg_head = bau_tablesp->va_queue_first; | 620 | bcp->bau_msg_head = bau_tablesp->va_queue_first; |
629 | bcp->va_queue_first = bau_tablesp->va_queue_first; | 621 | bcp->va_queue_first = bau_tablesp->va_queue_first; |
630 | bcp->va_queue_last = bau_tablesp->va_queue_last; | 622 | bcp->va_queue_last = bau_tablesp->va_queue_last; |
631 | bcp->watching = bau_tablesp->watching; | ||
632 | bcp->msg_statuses = bau_tablesp->msg_statuses; | 623 | bcp->msg_statuses = bau_tablesp->msg_statuses; |
633 | bcp->descriptor_base = adp; | 624 | bcp->descriptor_base = adp; |
634 | } | 625 | } |