diff for duplicates of <20120419110229.GB30447@aftab> diff --git a/a/1.txt b/N1/1.txt index 9859ce4..24cc6b8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On Thu, Apr 19, 2012 at 01:48:02PM +0530, Srivatsa S. Bhat wrote: > > > > err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val); > > - if (err) { -> > - if (err = -EEXIST) +> > - if (err == -EEXIST) > > - printk(KERN_WARNING "L3 disable slot %d in use!\n", > > - slot); > > + if (err) @@ -122,7 +122,7 @@ index 73d08ed98a64..b8f3653dddbc 100644 return -EINVAL; /* check whether the other slot has disabled the same index already */ - if (index = amd_get_l3_disable_slot(nb, !slot)) + if (index == amd_get_l3_disable_slot(nb, !slot)) - return -EINVAL; + return -EEXIST; @@ -131,7 +131,7 @@ index 73d08ed98a64..b8f3653dddbc 100644 @@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val); if (err) { - if (err = -EEXIST) + if (err == -EEXIST) - printk(KERN_WARNING "L3 disable slot %d in use!\n", - slot); + pr_warning("L3 slot %d in use/index already disabled!\n", diff --git a/a/content_digest b/N1/content_digest index fa294f3..6ccd5a9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\04F8FCA3A.5060504@linux.vnet.ibm.com\0" "From\0Borislav Petkov <bp@amd64.org>\0" "Subject\0Re: [patch] cpu: remove some dead code in store_cache_disable()\0" - "Date\0Thu, 19 Apr 2012 11:02:29 +0000\0" + "Date\0Thu, 19 Apr 2012 13:02:29 +0200\0" "To\0Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>\0" "Cc\0Dan Carpenter <dan.carpenter@oracle.com>" Thomas Gleixner <tglx@linutronix.de> @@ -31,7 +31,7 @@ "> > \n" "> > \terr = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);\n" "> > -\tif (err) {\n" - "> > -\t\tif (err = -EEXIST)\n" + "> > -\t\tif (err == -EEXIST)\n" "> > -\t\t\tprintk(KERN_WARNING \"L3 disable slot %d in use!\\n\",\n" "> > -\t\t\t\t\t slot);\n" "> > +\tif (err)\n" @@ -138,7 +138,7 @@ " \t\treturn -EINVAL;\n" " \n" " \t/* check whether the other slot has disabled the same index already */\n" - " \tif (index = amd_get_l3_disable_slot(nb, !slot))\n" + " \tif (index == amd_get_l3_disable_slot(nb, !slot))\n" "-\t\treturn -EINVAL;\n" "+\t\treturn -EEXIST;\n" " \n" @@ -147,7 +147,7 @@ "@@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,\n" " \terr = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);\n" " \tif (err) {\n" - " \t\tif (err = -EEXIST)\n" + " \t\tif (err == -EEXIST)\n" "-\t\t\tprintk(KERN_WARNING \"L3 disable slot %d in use!\\n\",\n" "-\t\t\t\t\t slot);\n" "+\t\t\tpr_warning(\"L3 slot %d in use/index already disabled!\\n\",\n" @@ -169,4 +169,4 @@ "Reg: Dornach, Landkreis Muenchen\n" HRB Nr. 43632 WEEE Registernr: 129 19551 -5be348482c0c8cdde4e2208029af090ae0559f5580746cc226c99cbcdf95ce06 +0e0063169fc9b96dbdff1d21d44e86e945bd1324d7b3126b60eabaf1ab3c473c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.