Commit a2beab31 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar

x86: make vsmp_init void, instead of static int

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarRavikiran Thirumalai <kiran@scalemp.com>
Acked-by: default avatarShai Fultheim <shai@scalemp.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 270883a8
...@@ -16,20 +16,20 @@ ...@@ -16,20 +16,20 @@
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
#include <asm/io.h> #include <asm/io.h>
static int __init vsmp_init(void) static void __init vsmp_init(void)
{ {
void *address; void *address;
unsigned int cap, ctl; unsigned int cap, ctl;
if (!early_pci_allowed()) if (!early_pci_allowed())
return 0; return;
/* Check if we are running on a ScaleMP vSMP box */ /* Check if we are running on a ScaleMP vSMP box */
if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) !=
PCI_VENDOR_ID_SCALEMP) || PCI_VENDOR_ID_SCALEMP) ||
(read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) !=
PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) PCI_DEVICE_ID_SCALEMP_VSMP_CTL))
return 0; return;
/* set vSMP magic bits to indicate vSMP capable kernel */ /* set vSMP magic bits to indicate vSMP capable kernel */
address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8); address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
...@@ -46,7 +46,7 @@ static int __init vsmp_init(void) ...@@ -46,7 +46,7 @@ static int __init vsmp_init(void)
} }
iounmap(address); iounmap(address);
return 0; return;
} }
core_initcall(vsmp_init); core_initcall(vsmp_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment