diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-12-21 14:19:54 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-12-25 04:47:44 -0500 |
| commit | 73c1b41e63f040e92669e61a02c7893933bfe743 (patch) | |
| tree | cde9545d0866b1c0df3abf5b53b6e78a7b22e083 /virt | |
| parent | 530e9b76ae8f863dfdef4a6ad0b38613d32e8c3f (diff) | |
cpu/hotplug: Cleanup state names
When the state names got added a script was used to add the extra argument
to the calls. The script basically converted the state constant to a
string, but the cleanup to convert these strings into meaningful ones did
not happen.
Replace all the useless strings with 'subsys/xxx/yyy:state' strings which
are used in all the other places already.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Link: http://lkml.kernel.org/r/20161221192112.085444152@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 2 | ||||
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-init.c | 2 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index ae95fc0e3214..5b4f60d43314 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c | |||
| @@ -456,7 +456,7 @@ int kvm_timer_hyp_init(void) | |||
| 456 | kvm_info("virtual timer IRQ%d\n", host_vtimer_irq); | 456 | kvm_info("virtual timer IRQ%d\n", host_vtimer_irq); |
| 457 | 457 | ||
| 458 | cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING, | 458 | cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING, |
| 459 | "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu, | 459 | "kvm/arm/timer:starting", kvm_timer_starting_cpu, |
| 460 | kvm_timer_dying_cpu); | 460 | kvm_timer_dying_cpu); |
| 461 | return err; | 461 | return err; |
| 462 | } | 462 | } |
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 8cebfbc19e90..5114391b7e5a 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c | |||
| @@ -428,7 +428,7 @@ int kvm_vgic_hyp_init(void) | |||
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | ret = cpuhp_setup_state(CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING, | 430 | ret = cpuhp_setup_state(CPUHP_AP_KVM_ARM_VGIC_INIT_STARTING, |
| 431 | "AP_KVM_ARM_VGIC_INIT_STARTING", | 431 | "kvm/arm/vgic:starting", |
| 432 | vgic_init_cpu_starting, vgic_init_cpu_dying); | 432 | vgic_init_cpu_starting, vgic_init_cpu_dying); |
| 433 | if (ret) { | 433 | if (ret) { |
| 434 | kvm_err("Cannot register vgic CPU notifier\n"); | 434 | kvm_err("Cannot register vgic CPU notifier\n"); |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index de102cae7125..ec298b7ca556 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -3944,7 +3944,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, | |||
| 3944 | goto out_free_1; | 3944 | goto out_free_1; |
| 3945 | } | 3945 | } |
| 3946 | 3946 | ||
| 3947 | r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "AP_KVM_STARTING", | 3947 | r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "kvm/cpu:starting", |
| 3948 | kvm_starting_cpu, kvm_dying_cpu); | 3948 | kvm_starting_cpu, kvm_dying_cpu); |
| 3949 | if (r) | 3949 | if (r) |
| 3950 | goto out_free_2; | 3950 | goto out_free_2; |
