Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88602
b: refs/heads/master
c: a2beab3
h: refs/heads/master
v: v3
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 9d0b4cd commit c23093f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 270883a8b98af5e6ed591b4762fb046e9f044dfb
refs/heads/master: a2beab31b167bd8ba49bb84944e07ac096f2ab0a
8 changes: 4 additions & 4 deletions trunk/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 c23093f

Please sign in to comment.