Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/xen: rename some PV-only functions in smp_pv.c

After code split between PV and HVM some functions in xen_smp_ops have
xen_pv_ prefix and some only xen_ which makes them look like they're
common for both PV and HVM while they're not. Rename all the rest to
have xen_pv_ prefix.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

authored by

Vitaly Kuznetsov and committed by
Juergen Gross
8cb6de39 33af7469

+14 -14
+14 -14
arch/x86/xen/smp_pv.c
··· 221 221 xen_init_spinlocks(); 222 222 } 223 223 224 - static void __init xen_smp_prepare_cpus(unsigned int max_cpus) 224 + static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) 225 225 { 226 226 unsigned cpu; 227 227 unsigned int i; ··· 337 337 return 0; 338 338 } 339 339 340 - static int xen_cpu_up(unsigned int cpu, struct task_struct *idle) 340 + static int xen_pv_cpu_up(unsigned int cpu, struct task_struct *idle) 341 341 { 342 342 int rc; 343 343 ··· 371 371 return 0; 372 372 } 373 373 374 - static void xen_smp_cpus_done(unsigned int max_cpus) 374 + static void xen_pv_smp_cpus_done(unsigned int max_cpus) 375 375 { 376 376 } 377 377 378 378 #ifdef CONFIG_HOTPLUG_CPU 379 - static int xen_cpu_disable(void) 379 + static int xen_pv_cpu_disable(void) 380 380 { 381 381 unsigned int cpu = smp_processor_id(); 382 382 if (cpu == 0) ··· 404 404 } 405 405 } 406 406 407 - static void xen_play_dead(void) /* used only with HOTPLUG_CPU */ 407 + static void xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */ 408 408 { 409 409 play_dead_common(); 410 410 HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(smp_processor_id()), NULL); ··· 421 421 } 422 422 423 423 #else /* !CONFIG_HOTPLUG_CPU */ 424 - static int xen_cpu_disable(void) 424 + static int xen_pv_cpu_disable(void) 425 425 { 426 426 return -ENOSYS; 427 427 } ··· 431 431 BUG(); 432 432 } 433 433 434 - static void xen_play_dead(void) 434 + static void xen_pv_play_dead(void) 435 435 { 436 436 BUG(); 437 437 } ··· 451 451 BUG(); 452 452 } 453 453 454 - static void xen_stop_other_cpus(int wait) 454 + static void xen_pv_stop_other_cpus(int wait) 455 455 { 456 456 smp_call_function(stop_self, NULL, wait); 457 457 } ··· 478 478 479 479 static const struct smp_ops xen_smp_ops __initconst = { 480 480 .smp_prepare_boot_cpu = xen_pv_smp_prepare_boot_cpu, 481 - .smp_prepare_cpus = xen_smp_prepare_cpus, 482 - .smp_cpus_done = xen_smp_cpus_done, 481 + .smp_prepare_cpus = xen_pv_smp_prepare_cpus, 482 + .smp_cpus_done = xen_pv_smp_cpus_done, 483 483 484 - .cpu_up = xen_cpu_up, 484 + .cpu_up = xen_pv_cpu_up, 485 485 .cpu_die = xen_pv_cpu_die, 486 - .cpu_disable = xen_cpu_disable, 487 - .play_dead = xen_play_dead, 486 + .cpu_disable = xen_pv_cpu_disable, 487 + .play_dead = xen_pv_play_dead, 488 488 489 - .stop_other_cpus = xen_stop_other_cpus, 489 + .stop_other_cpus = xen_pv_stop_other_cpus, 490 490 .smp_send_reschedule = xen_smp_send_reschedule, 491 491 492 492 .send_call_func_ipi = xen_smp_send_call_function_ipi,