diff --git a/[refs] b/[refs] index 693f650359ae..0a47cd8780f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99fb4d349db7e7dacb2099c5cc320a9e2d31c1ef +refs/heads/master: 659d2618b38f8a4d91bdb19cfc5c7fb330a4c55a diff --git a/trunk/arch/x86/kernel/vmi_32.c b/trunk/arch/x86/kernel/vmi_32.c index 23206ba16874..1d3302cc2ddf 100644 --- a/trunk/arch/x86/kernel/vmi_32.c +++ b/trunk/arch/x86/kernel/vmi_32.c @@ -858,7 +858,7 @@ void __init vmi_init(void) #endif } -void vmi_activate(void) +void __init vmi_activate(void) { unsigned long flags;