lkml.org 
[lkml]   [2012]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [patch] cpu: remove some dead code in store_cache_disable()
    On 04/19/2012 12:30 PM, Dan Carpenter wrote:

    > amd_set_l3_disable_slot() never returns -EEXIST, it only returns -EINVAL
    > or zero.
    >
    > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    >
    > diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
    > index 73d08ed..7b4e294 100644
    > --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
    > +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
    > @@ -466,12 +466,9 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,
    > return -EINVAL;
    >
    > err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);
    > - if (err) {
    > - if (err == -EEXIST)
    > - printk(KERN_WARNING "L3 disable slot %d in use!\n",
    > - slot);
    > + if (err)
    > return err;
    > - }
    > +
    > return count;
    > }
    >


    Looking at the comments around the code and the print statement your patch
    is trying to remove, I wonder if it would be more appropriate to return
    -EEXIST in amd_set_l3_disable_slot(), like this:

    ---
    From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
    Subject: [PATCH] cpu: Fix error return code in amd_set_l3_disable_slot()

    If the L3 disable slot is already in use, return -EEXIST instead of -EINVAL.
    The caller, store_cache_disable(), checks this return value to print an
    appropriate warning.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
    ---

    arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
    index 73d08ed..0b49e29 100644
    --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
    +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
    @@ -433,7 +433,7 @@ int amd_set_l3_disable_slot(struct amd_northbridge *nb, int cpu, unsigned slot,
    /* check if @slot is already used or the index is already disabled */
    ret = amd_get_l3_disable_slot(nb, slot);
    if (ret >= 0)
    - return -EINVAL;
    + return -EEXIST;

    if (index > nb->l3_cache.indices)
    return -EINVAL;

    Regards,
    Srivatsa S. Bhat



    \
     
     \ /
      Last update: 2012-04-19 10:33    [W:0.024 / U:20.432 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site