lkml.org 
[lkml]   [2008]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 04 of 12] xen: make dummy_shared_info non-static
    Date
    From
    Rename dummy_shared_info to xen_dummy_shared_info and make it
    non-static, in anticipation of users outside of enlighten.c

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/xen/enlighten.c | 6 +++---
    arch/x86/xen/xen-ops.h | 1 +
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    --- a/arch/x86/xen/enlighten.c
    +++ b/arch/x86/xen/enlighten.c
    @@ -75,13 +75,13 @@
    struct start_info *xen_start_info;
    EXPORT_SYMBOL_GPL(xen_start_info);

    -static /* __initdata */ struct shared_info dummy_shared_info;
    +struct shared_info xen_dummy_shared_info;

    /*
    * Point at some empty memory to start with. We map the real shared_info
    * page as soon as fixmap is up and running.
    */
    -struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info;
    +struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info;

    /*
    * Flag to determine whether vcpu info placement is available on all
    @@ -104,7 +104,7 @@
    int err;
    struct vcpu_info *vcpup;

    - BUG_ON(HYPERVISOR_shared_info == &dummy_shared_info);
    + BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);
    per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];

    if (!have_vcpu_info_placement)
    diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
    --- a/arch/x86/xen/xen-ops.h
    +++ b/arch/x86/xen/xen-ops.h
    @@ -15,6 +15,7 @@
    DECLARE_PER_CPU(unsigned long, xen_current_cr3);

    extern struct start_info *xen_start_info;
    +extern struct shared_info xen_dummy_shared_info;
    extern struct shared_info *HYPERVISOR_shared_info;

    char * __init xen_memory_setup(void);



    \
     
     \ /
      Last update: 2008-05-23 15:47    [W:0.063 / U:88.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site