[PATCH 2/5] [PATCH] make vsmp_init void, instead of static int

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Glauber Costa
Date: Monday, February 11, 2008 - 12:16 pm

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalemp.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
---
 arch/x86/kernel/vsmp_64.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index d971210..9766917 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -16,20 +16,20 @@ #include <linux/pci_regs.h>
 #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);
-- 
1.4.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/5] Change vsmp compile dependency, Glauber Costa, (Mon Feb 11, 12:16 pm)
[PATCH 2/5] [PATCH] make vsmp_init void, instead of static int, Glauber Costa, (Mon Feb 11, 12:16 pm)
[PATCH 3/5] [PATCH] call vsmp_init explicitly, Glauber Costa, (Mon Feb 11, 12:16 pm)
[PATCH 4/5] [PATCH] introduce paravirt helpers, Glauber Costa, (Mon Feb 11, 12:16 pm)
[PATCH 5/5] [PATCH] use the paravirt helpers, Glauber Costa, (Mon Feb 11, 12:16 pm)
Re: [PATCH 3/5] [PATCH] call vsmp_init explicitly, Ingo Molnar, (Sun Feb 17, 11:04 am)
Re: [PATCH 4/5] [PATCH] introduce paravirt helpers, Ingo Molnar, (Sun Feb 17, 11:05 am)
Re: [PATCH 4/5] [PATCH] introduce paravirt helpers, Glauber Costa, (Sun Feb 17, 1:56 pm)
Re: [PATCH 4/5] [PATCH] introduce paravirt helpers, Ravikiran Thirumalai, (Tue Feb 19, 12:59 pm)