Re: linux-next: Tree for Jun 5 (amd64_edac)

[Borislav Petkov]

On Tue, Jun 05, 2012 at 02:38:16PM -0300, Mauro Carvalho Chehab wrote:
> Thanks for pointing it. The enclosed patch should fix it.
> 
> amd64_edac: Avoid compilation breakage
> 
> when:
> 	CONFIG_EDAC_AMD64=m
> 	CONFIG_EDAC_AMD64_ERROR_INJECTION=y
> 	# CONFIG_EDAC_DEBUG is not set
> 
> The compilation breaks, as amd64_remove_sysfs_dbg_files() were not declared
> as static.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> 
> diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
> index 098f336..8d48047 100644
> --- a/drivers/edac/amd64_edac.h
> +++ b/drivers/edac/amd64_edac.h
> @@ -421,7 +421,7 @@ static inline int amd64_create_sysfs_dbg_files(struct mem_ctl_info *mci)
>  {
>  	return 0;
>  }
> -void inline amd64_remove_sysfs_dbg_files(struct mem_ctl_info *mci)
> +static void inline amd64_remove_sysfs_dbg_files(struct mem_ctl_info *mci)

Please merge this one with the previous patch which causes the breakage:

commit faf20d4e226c53a963c384d36d8aa82c77be6dfb
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Mar 21 14:00:44 2012 -0300

    amd64_edac: convert sysfs logic to use struct device

    Now that the EDAC core supports struct device, there's no sense
    on having any logic at the EDAC core to simulate it. So, instead
    of adding such logic there, change the logic at amd64_edac to
    use it.

    Reviewed-by: Aristeu Rozanski <arozansk@xxxxxxxxxx>
    Cc: Doug Thompson <norsk5@xxxxxxxxx>
    Cc: Borislav Petkov <borislav.petkov@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

Thanks.

-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/