diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:46:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:46:35 -0400 |
| commit | 537b60d17894b7c19a6060feae40299d7109d6e7 (patch) | |
| tree | 11a30267b4ecb7175d02215a995c8b6461304b9c /arch/x86/kernel/apic | |
| parent | 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 (diff) | |
| parent | a289cc7c70da784a2d370b91885cab4f966dcb0f (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: uv_irq.c: Fix all sparse warnings
x86, UV: Improve BAU performance and error recovery
x86, UV: Delete unneeded boot messages
x86, UV: Clean up UV headers for MMR definitions
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index c085d52dbaf2..e46f98f36e31 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
| @@ -735,9 +735,6 @@ void __init uv_system_init(void) | |||
| 735 | uv_node_to_blade[nid] = blade; | 735 | uv_node_to_blade[nid] = blade; |
| 736 | uv_cpu_to_blade[cpu] = blade; | 736 | uv_cpu_to_blade[cpu] = blade; |
| 737 | max_pnode = max(pnode, max_pnode); | 737 | max_pnode = max(pnode, max_pnode); |
| 738 | |||
| 739 | printk(KERN_DEBUG "UV: cpu %d, apicid 0x%x, pnode %d, nid %d, lcpu %d, blade %d\n", | ||
| 740 | cpu, apicid, pnode, nid, lcpu, blade); | ||
| 741 | } | 738 | } |
| 742 | 739 | ||
| 743 | /* Add blade/pnode info for nodes without cpus */ | 740 | /* Add blade/pnode info for nodes without cpus */ |