Subject: [PATCH] x86/acpi: fix incorrect placement of __initdata tag

__initdata tag should be placed between the variable name and equal
sign for the variable to be placed in the intended .init.data section.

Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
---
arch/x86/kernel/acpi/boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 1f7c074..6c0b43b 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -695,7 +695,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
#ifdef CONFIG_HPET_TIMER
#include <asm/hpet.h>

-static struct __initdata resource *hpet_res;
+static struct resource *hpet_res __initdata;

static int __init acpi_parse_hpet(struct acpi_table_header *table)
{
--
1.8.2.3


2013-09-30 14:24:44

by Alan Stern

[permalink] [raw]
Subject: Re: [PATCH] x86/acpi: fix incorrect placement of __initdata tag

On Mon, 30 Sep 2013, Bartlomiej Zolnierkiewicz wrote:

> __initdata tag should be placed between the variable name and equal
> sign for the variable to be placed in the intended .init.data section.

The line you are changing does not have an equals sign. Therefore,
according to your own patch description, the patch is incorrect. :-)

> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
> Signed-off-by: Kyungmin Park <[email protected]>
> ---
> arch/x86/kernel/acpi/boot.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> index 1f7c074..6c0b43b 100644
> --- a/arch/x86/kernel/acpi/boot.c
> +++ b/arch/x86/kernel/acpi/boot.c
> @@ -695,7 +695,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
> #ifdef CONFIG_HPET_TIMER
> #include <asm/hpet.h>
>
> -static struct __initdata resource *hpet_res;
> +static struct resource *hpet_res __initdata;
>
> static int __init acpi_parse_hpet(struct acpi_table_header *table)
> {

Alan Stern

Subject: Re: [PATCH] x86/acpi: fix incorrect placement of __initdata tag

On Monday, September 30, 2013 10:24:41 AM Alan Stern wrote:
> On Mon, 30 Sep 2013, Bartlomiej Zolnierkiewicz wrote:
>
> > __initdata tag should be placed between the variable name and equal
> > sign for the variable to be placed in the intended .init.data section.
>
> The line you are changing does not have an equals sign. Therefore,
> according to your own patch description, the patch is incorrect. :-)

Uh, indeed, copypasta is bad. :)

Thanks for noticing, I'll post v2 shortly.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> > Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
> > Signed-off-by: Kyungmin Park <[email protected]>
> > ---
> > arch/x86/kernel/acpi/boot.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> > index 1f7c074..6c0b43b 100644
> > --- a/arch/x86/kernel/acpi/boot.c
> > +++ b/arch/x86/kernel/acpi/boot.c
> > @@ -695,7 +695,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
> > #ifdef CONFIG_HPET_TIMER
> > #include <asm/hpet.h>
> >
> > -static struct __initdata resource *hpet_res;
> > +static struct resource *hpet_res __initdata;
> >
> > static int __init acpi_parse_hpet(struct acpi_table_header *table)
> > {
>
> Alan Stern