diff --git a/[refs] b/[refs] index 9f4ffe9a4c10..fe3d9c5b6b9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56919c5c97aa07b150311c5c9802af07872ee2b0 +refs/heads/master: a16b043cc96db4a01abb337bef4a51cebcfcbb1b diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index 7335435f528e..e24489b409cf 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -1332,7 +1332,7 @@ static u64 stat_get(void *_offset) DEFINE_SIMPLE_ATTRIBUTE(stat_fops, stat_get, NULL, "%llu\n"); -static __init void kvm_init_debug(void) +static void kvm_init_debug(void) { struct kvm_stats_debugfs_item *p; diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c index f1746afab9e5..abb7beeb8f54 100644 --- a/trunk/drivers/kvm/x86.c +++ b/trunk/drivers/kvm/x86.c @@ -1049,7 +1049,7 @@ long kvm_arch_vm_ioctl(struct file *filp, return r; } -static __init void kvm_init_msr_list(void) +static void kvm_init_msr_list(void) { u32 dummy[2]; unsigned i, j;