[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] static and __init symbols in machine_kexec.c

As per the patch, some symbols that really ought to be __init or static aren't.

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>

 linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Curiously, making xen_max_nr_phys_cpus __init causes a section missmatch
error at compile time. I guess this is to do with the way global ints
are handled. I confirmed that its consistent across x86_32, x86_64 and
ia64. So I guess its ok to leave it as is.

error: xen_max_nr_phys_cpus causes a section type conflict

    2007-05-16 15:46:33.000000000 +0900
+++ xen-ia64-unstable.hg/linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c  
2007-05-16 15:54:43.000000000 +0900
@@ -11,11 +11,11 @@
 extern void machine_kexec_setup_load_arg(xen_kexec_image_t *xki, 
                                         struct kimage *image);
-int xen_max_nr_phys_cpus;
-struct resource xen_hypervisor_res;
-struct resource *xen_phys_cpus;
+static int xen_max_nr_phys_cpus;
+static struct __init resource xen_hypervisor_res;
+static struct __init resource *xen_phys_cpus;
-void xen_machine_kexec_setup_resources(void)
+void __init xen_machine_kexec_setup_resources(void)
        xen_kexec_range_t range;
        struct resource *res;
@@ -104,7 +104,7 @@ void xen_machine_kexec_setup_resources(v
-void xen_machine_kexec_register_resources(struct resource *res)
+void __init xen_machine_kexec_register_resources(struct resource *res)
        int k;

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.