]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Jeff Mahoney <jeffm@suse.com> |
2 | Subject: x86: Fix section conflict with kvm_setup_secondary_clock | |
3 | ||
4 | This patch marks kvm_setup_secondary_clock as __cpuinit to fix | |
5 | section mismatch warnings. It calls setup_secondary_APIC_clock, which | |
6 | is marked __cpuinit. | |
7 | ||
8 | Signed-off-by: Jeff Mahoney <jeffm@suse.com> | |
9 | --- | |
10 | arch/x86/kernel/kvmclock.c | 2 +- | |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
12 | ||
13 | --- a/arch/x86/kernel/kvmclock.c | |
14 | +++ b/arch/x86/kernel/kvmclock.c | |
15 | @@ -100,7 +100,7 @@ static int kvm_register_clock(char *txt) | |
16 | } | |
17 | ||
18 | #ifdef CONFIG_X86_LOCAL_APIC | |
19 | -static void kvm_setup_secondary_clock(void) | |
20 | +static void __cpuinit kvm_setup_secondary_clock(void) | |
21 | { | |
22 | /* | |
23 | * Now that the first cpu already had this clocksource initialized, |