aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2009-03-11 06:19:54 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-30 12:27:07 -0400
commitf0783708bf63a2827863cf2be57c08a24843e6bd (patch)
treea716d55ed1f3486632842031b7fb1f1ed5ab71a5
parenta649b720614d5675dc402bef75a92576143fede7 (diff)
xen: drop kexec bits from /sys/hypervisor since kexec isn't implemented yet
I needed this to compile since there is no kexec yet in pvops kernel CC drivers/xen/sys-hypervisor.o drivers/xen/sys-hypervisor.c: In function 'hyper_sysfs_init': drivers/xen/sys-hypervisor.c:405: error: 'vmcoreinfo_size_xen' undeclared (first use in this function) drivers/xen/sys-hypervisor.c:405: error: (Each undeclared identifier is reported only once drivers/xen/sys-hypervisor.c:405: error: for each function it appears in.) drivers/xen/sys-hypervisor.c:406: error: implicit declaration of function 'xen_sysfs_vmcoreinfo_init' drivers/xen/sys-hypervisor.c: In function 'hyper_sysfs_exit': drivers/xen/sys-hypervisor.c:433: error: 'vmcoreinfo_size_xen' undeclared (first use in this function) drivers/xen/sys-hypervisor.c:434: error: implicit declaration of function 'xen_sysfs_vmcoreinfo_destroy' Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r--drivers/xen/sys-hypervisor.c41
1 files changed, 0 insertions, 41 deletions
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index 1267d6fcc0c7..88a60e03ccf0 100644
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -353,32 +353,6 @@ static void xen_properties_destroy(void)
353 sysfs_remove_group(hypervisor_kobj, &xen_properties_group); 353 sysfs_remove_group(hypervisor_kobj, &xen_properties_group);
354} 354}
355 355
356#ifdef CONFIG_KEXEC
357
358extern size_t vmcoreinfo_size_xen;
359extern unsigned long paddr_vmcoreinfo_xen;
360
361static ssize_t vmcoreinfo_show(struct hyp_sysfs_attr *attr, char *page)
362{
363 return sprintf(page, "%lx %zx\n",
364 paddr_vmcoreinfo_xen, vmcoreinfo_size_xen);
365}
366
367HYPERVISOR_ATTR_RO(vmcoreinfo);
368
369static int __init xen_sysfs_vmcoreinfo_init(void)
370{
371 return sysfs_create_file(hypervisor_kobj,
372 &vmcoreinfo_attr.attr);
373}
374
375static void xen_sysfs_vmcoreinfo_destroy(void)
376{
377 sysfs_remove_file(hypervisor_kobj, &vmcoreinfo_attr.attr);
378}
379
380#endif
381
382static int __init hyper_sysfs_init(void) 356static int __init hyper_sysfs_init(void)
383{ 357{
384 int ret; 358 int ret;
@@ -401,20 +375,9 @@ static int __init hyper_sysfs_init(void)
401 ret = xen_properties_init(); 375 ret = xen_properties_init();
402 if (ret) 376 if (ret)
403 goto prop_out; 377 goto prop_out;
404#ifdef CONFIG_KEXEC
405 if (vmcoreinfo_size_xen != 0) {
406 ret = xen_sysfs_vmcoreinfo_init();
407 if (ret)
408 goto vmcoreinfo_out;
409 }
410#endif
411 378
412 goto out; 379 goto out;
413 380
414#ifdef CONFIG_KEXEC
415vmcoreinfo_out:
416#endif
417 xen_properties_destroy();
418prop_out: 381prop_out:
419 xen_sysfs_uuid_destroy(); 382 xen_sysfs_uuid_destroy();
420uuid_out: 383uuid_out:
@@ -429,10 +392,6 @@ out:
429 392
430static void __exit hyper_sysfs_exit(void) 393static void __exit hyper_sysfs_exit(void)
431{ 394{
432#ifdef CONFIG_KEXEC
433 if (vmcoreinfo_size_xen != 0)
434 xen_sysfs_vmcoreinfo_destroy();
435#endif
436 xen_properties_destroy(); 395 xen_properties_destroy();
437 xen_compilation_destroy(); 396 xen_compilation_destroy();
438 xen_sysfs_uuid_destroy(); 397 xen_sysfs_uuid_destroy();