Re: [tip:x86/debug] x86/EFI: Properly init-annotate BGRT code

[Josh Triplett]

On Thu, Jan 24, 2013 at 12:34:21PM -0800, tip-bot for Jan Beulich wrote:
> Commit-ID:  13f0e4d2b9e2209f13d5a4122478eb79e6136870
> Gitweb:     http://git.kernel.org/tip/13f0e4d2b9e2209f13d5a4122478eb79e6136870
> Author:     Jan Beulich <JBeulich@xxxxxxxx>
> AuthorDate: Fri, 23 Nov 2012 16:30:07 +0000
> Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
> CommitDate: Thu, 24 Jan 2013 17:12:18 +0100
> 
> x86/EFI: Properly init-annotate BGRT code
> 
> These items are only ever referenced from initialization code.

Not true, and this patch will break the BGRT code.  bgrt_init, which
does indeed have an __init annotation, stores bgrt_image and
bgrt_image_size into the .private and .size fields of a sysfs
bin_attribute, which does *not* have an __initdata annotation, and which
will get read whenever the user reads the corresponding sysfs attribute.

> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> Cc: <mjg@xxxxxxxxxx>
> Link: http://lkml.kernel.org/r/50AFB29F02000078000AAE8E@xxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
>  arch/x86/platform/efi/efi-bgrt.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
> index d9c1b95..7145ec6 100644
> --- a/arch/x86/platform/efi/efi-bgrt.c
> +++ b/arch/x86/platform/efi/efi-bgrt.c
> @@ -11,20 +11,21 @@
>   * published by the Free Software Foundation.
>   */
>  #include <linux/kernel.h>
> +#include <linux/init.h>
>  #include <linux/acpi.h>
>  #include <linux/efi.h>
>  #include <linux/efi-bgrt.h>
>  
>  struct acpi_table_bgrt *bgrt_tab;
> -void *bgrt_image;
> -size_t bgrt_image_size;
> +void *__initdata bgrt_image;
> +size_t __initdata bgrt_image_size;
>  
>  struct bmp_header {
>  	u16 id;
>  	u32 size;
>  } __packed;
>  
> -void efi_bgrt_init(void)
> +void __init efi_bgrt_init(void)
>  {
>  	acpi_status status;
>  	void __iomem *image;
> --
> 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/
> 
> 
--
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/