diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:24 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:24 -0500 |
commit | ed4aed98da8d042716d327a0b538dd8002c0a767 (patch) | |
tree | 6de35e1ef4667bc8d1d50a5187b0b60c85c66cb2 /arch/x86/kernel/vsmp_64.c | |
parent | 9a211abeaab74e2634669a64ebd82fac5d94d276 (diff) |
x86: clean up arch/x86/kernel/vsmp_64.c
White space and coding style clenaup.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
-rw-r--r-- | arch/x86/kernel/vsmp_64.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index 414caf0c5f9a..d971210a6d36 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
@@ -25,21 +25,24 @@ static int __init vsmp_init(void) | |||
25 | return 0; | 25 | return 0; |
26 | 26 | ||
27 | /* Check if we are running on a ScaleMP vSMP box */ | 27 | /* Check if we are running on a ScaleMP vSMP box */ |
28 | if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != PCI_VENDOR_ID_SCALEMP) || | 28 | if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != |
29 | (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) | 29 | PCI_VENDOR_ID_SCALEMP) || |
30 | (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != | ||
31 | PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) | ||
30 | return 0; | 32 | return 0; |
31 | 33 | ||
32 | /* set vSMP magic bits to indicate vSMP capable kernel */ | 34 | /* set vSMP magic bits to indicate vSMP capable kernel */ |
33 | address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8); | 35 | address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8); |
34 | cap = readl(address); | 36 | cap = readl(address); |
35 | ctl = readl(address + 4); | 37 | ctl = readl(address + 4); |
36 | printk("vSMP CTL: capabilities:0x%08x control:0x%08x\n", cap, ctl); | 38 | printk(KERN_INFO "vSMP CTL: capabilities:0x%08x control:0x%08x\n", |
39 | cap, ctl); | ||
37 | if (cap & ctl & (1 << 4)) { | 40 | if (cap & ctl & (1 << 4)) { |
38 | /* Turn on vSMP IRQ fastpath handling (see system.h) */ | 41 | /* Turn on vSMP IRQ fastpath handling (see system.h) */ |
39 | ctl &= ~(1 << 4); | 42 | ctl &= ~(1 << 4); |
40 | writel(ctl, address + 4); | 43 | writel(ctl, address + 4); |
41 | ctl = readl(address + 4); | 44 | ctl = readl(address + 4); |
42 | printk("vSMP CTL: control set to:0x%08x\n", ctl); | 45 | printk(KERN_INFO "vSMP CTL: control set to:0x%08x\n", ctl); |
43 | } | 46 | } |
44 | 47 | ||
45 | iounmap(address); | 48 | iounmap(address); |