diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:44:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:44:45 -0700 |
| commit | 896d01796d33e50589c96bbef5f0017d3cfc4ee8 (patch) | |
| tree | fd192a6d8f6a700f58114395dda9e2e1e5c02038 | |
| parent | 0df55ea55bf1f4827115af4740899980b4fce77f (diff) | |
| parent | 3c52b7bf6967e53dec3fbbcf99fee65e49e600df (diff) | |
| download | linux-3.10-896d01796d33e50589c96bbef5f0017d3cfc4ee8.tar.gz linux-3.10-896d01796d33e50589c96bbef5f0017d3cfc4ee8.tar.bz2 linux-3.10-896d01796d33e50589c96bbef5f0017d3cfc4ee8.zip | |
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen:pvhvm: Modpost section mismatch fix
| -rw-r--r-- | arch/x86/xen/platform-pci-unplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c index 25c52f94a27..ffcf2615640 100644 --- a/arch/x86/xen/platform-pci-unplug.c +++ b/arch/x86/xen/platform-pci-unplug.c @@ -35,7 +35,7 @@ EXPORT_SYMBOL_GPL(xen_platform_pci_unplug); #ifdef CONFIG_XEN_PVHVM static int xen_emul_unplug; -static int __init check_platform_magic(void) +static int check_platform_magic(void) { short magic; char protocol; |