lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
    Date
    At the start of the function we were checking for idx != 0
    and bailing out. And later calling extend_brk if idx != 0.

    That is unnecessary so remove that checks.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    arch/x86/xen/p2m.c | 25 ++++++++++++-------------
    1 files changed, 12 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
    index 8b3a395..952edef 100644
    --- a/arch/x86/xen/p2m.c
    +++ b/arch/x86/xen/p2m.c
    @@ -502,6 +502,8 @@ static bool alloc_p2m(unsigned long pfn)
    static bool __init early_alloc_p2m_middle(unsigned long pfn, bool check_boundary)
    {
    unsigned topidx, mididx, idx;
    + unsigned long *p2m;
    + unsigned long *mid_mfn_p;

    topidx = p2m_top_index(pfn);
    mididx = p2m_mid_index(pfn);
    @@ -522,24 +524,21 @@ static bool __init early_alloc_p2m_middle(unsigned long pfn, bool check_boundary
    return false;

    /* Boundary cross-over for the edges: */
    - if (idx) {
    - unsigned long *p2m = extend_brk(PAGE_SIZE, PAGE_SIZE);
    - unsigned long *mid_mfn_p;
    + p2m = extend_brk(PAGE_SIZE, PAGE_SIZE);

    - p2m_init(p2m);
    + p2m_init(p2m);

    - p2m_top[topidx][mididx] = p2m;
    + p2m_top[topidx][mididx] = p2m;

    - /* For save/restore we need to MFN of the P2M saved */
    + /* For save/restore we need to MFN of the P2M saved */

    - mid_mfn_p = p2m_top_mfn_p[topidx];
    - WARN(mid_mfn_p[mididx] != virt_to_mfn(p2m_missing),
    - "P2M_TOP_P[%d][%d] != MFN of p2m_missing!\n",
    - topidx, mididx);
    - mid_mfn_p[mididx] = virt_to_mfn(p2m);
    + mid_mfn_p = p2m_top_mfn_p[topidx];
    + WARN(mid_mfn_p[mididx] != virt_to_mfn(p2m_missing),
    + "P2M_TOP_P[%d][%d] != MFN of p2m_missing!\n",
    + topidx, mididx);
    + mid_mfn_p[mididx] = virt_to_mfn(p2m);

    - }
    - return idx != 0;
    + return true;
    }

    static bool __init early_alloc_p2m(unsigned long pfn)
    --
    1.7.7.5


    \
     
     \ /
      Last update: 2012-03-30 22:45    [W:0.022 / U:92.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site