Skip to content

Commit

Permalink
x86: make vsmp_init void, instead of static int
Browse files Browse the repository at this point in the history
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalemp.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 270883a commit a2beab3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kernel/vsmp_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
#include <asm/pci-direct.h>
#include <asm/io.h>

static int __init vsmp_init(void)
static void __init vsmp_init(void)
{
void *address;
unsigned int cap, ctl;

if (!early_pci_allowed())
return 0;
return;

/* Check if we are running on a ScaleMP vSMP box */
if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) !=
PCI_VENDOR_ID_SCALEMP) ||
(read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) !=
PCI_DEVICE_ID_SCALEMP_VSMP_CTL))
return 0;
return;

/* set vSMP magic bits to indicate vSMP capable kernel */
address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
Expand All @@ -46,7 +46,7 @@ static int __init vsmp_init(void)
}

iounmap(address);
return 0;
return;
}

core_initcall(vsmp_init);

0 comments on commit a2beab3

Please sign in to comment.