aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/vsmp_64.c
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-02-11 17:16:02 -0200
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:47 +0200
commita2beab31b167bd8ba49bb84944e07ac096f2ab0a (patch)
tree9ccc2f111b6cb3b0165d30a18692658554f631de /arch/x86/kernel/vsmp_64.c
parent270883a8b98af5e6ed591b4762fb046e9f044dfb (diff)
downloadlinux-a2beab31b167bd8ba49bb84944e07ac096f2ab0a.tar.gz
x86: make vsmp_init void, instead of static int
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>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
-rw-r--r--arch/x86/kernel/vsmp_64.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index d971210a6d3..976691726de 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -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);
@@ -46,7 +46,7 @@ static int __init vsmp_init(void)
}
iounmap(address);
- return 0;
+ return;
}
core_initcall(vsmp_init);