diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-02-11 14:16:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:47 -0400 |
commit | a2beab31b167bd8ba49bb84944e07ac096f2ab0a (patch) | |
tree | 9ccc2f111b6cb3b0165d30a18692658554f631de /arch | |
parent | 270883a8b98af5e6ed591b4762fb046e9f044dfb (diff) |
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')
-rw-r--r-- | 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 d971210a6d36..976691726de4 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
@@ -16,20 +16,20 @@ | |||
16 | #include <asm/pci-direct.h> | 16 | #include <asm/pci-direct.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | 18 | ||
19 | static int __init vsmp_init(void) | 19 | static void __init vsmp_init(void) |
20 | { | 20 | { |
21 | void *address; | 21 | void *address; |
22 | unsigned int cap, ctl; | 22 | unsigned int cap, ctl; |
23 | 23 | ||
24 | if (!early_pci_allowed()) | 24 | if (!early_pci_allowed()) |
25 | return 0; | 25 | return; |
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) != | 28 | if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != |
29 | PCI_VENDOR_ID_SCALEMP) || | 29 | PCI_VENDOR_ID_SCALEMP) || |
30 | (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != | 30 | (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != |
31 | PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) | 31 | PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) |
32 | return 0; | 32 | return; |
33 | 33 | ||
34 | /* set vSMP magic bits to indicate vSMP capable kernel */ | 34 | /* set vSMP magic bits to indicate vSMP capable kernel */ |
35 | 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); |
@@ -46,7 +46,7 @@ static int __init vsmp_init(void) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | iounmap(address); | 48 | iounmap(address); |
49 | return 0; | 49 | return; |
50 | } | 50 | } |
51 | 51 | ||
52 | core_initcall(vsmp_init); | 52 | core_initcall(vsmp_init); |