git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
kvmclock.c
diff --git
a/arch/x86/kernel/kvmclock.c
b/arch/x86/kernel/kvmclock.c
index
87edf1c
..
d02def0
100644
(file)
--- a/
arch/x86/kernel/kvmclock.c
+++ b/
arch/x86/kernel/kvmclock.c
@@
-113,7
+113,7
@@
static void kvm_setup_secondary_clock(void)
#endif
#ifdef CONFIG_SMP
-void __init kvm_smp_prepare_boot_cpu(void)
+
static
void __init kvm_smp_prepare_boot_cpu(void)
{
WARN_ON(kvm_register_clock("primary cpu clock"));
native_smp_prepare_boot_cpu();