Skip to contentSkip to conversation

x86/acpi: fix incorrect placement of __initdata tag

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Sep 30, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/x86/kernel/acpi/boot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/acpi/boot.c +1 -1
index 1f7c074..6c0b43b 100644
@@ -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)
 {
Signature · 1 line
1.8.2.3
#1 lore raw
Quoted 2 lines · Bartlomiej Zolnierkiewicz

__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. :-)

Quoted 11 lines
---
 arch/x86/kernel/acpi/boot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/acpi/boot.c +0 -0
index 1f7c074..6c0b43b 100644

arch/x86/kernel/acpi/boot.c static int __init acpi_parse_sbf(struct acpi_table_header *table) · line 701

Quoted 8 lines
arch/x86/kernel/acpi/boot.c +1 -1
@@ -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

#2 lore raw
Quoted 7 lines · Alan Stern
Quoted 2 lines · Bartlomiej Zolnierkiewicz

__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

Quoted 21 lines
Quoted 11 lines
---
 arch/x86/kernel/acpi/boot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/acpi/boot.c +0 -0
index 1f7c074..6c0b43b 100644

arch/x86/kernel/acpi/boot.c static int __init acpi_parse_sbf(struct acpi_table_header *table) · line 701

Quoted 8 lines
arch/x86/kernel/acpi/boot.c +1 -1
@@ -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