[2/3] x86 / ACPI: Fix __initdata and __init attribute locations in boot.c

Message ID 1377074777-10639-2-git-send-email-hanjun.guo@linaro.org
State New
Headers show

Commit Message

Hanjun Guo Aug. 21, 2013, 8:46 a.m.
__initdata should come after the variable name being declared and
nowhere else, in this way the variable will be placed in the intended
section.

__init belongs after the return type on functions, not before it.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
 arch/x86/kernel/acpi/boot.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 665f857..eb1d67d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -45,7 +45,7 @@ 
 #include <asm/smp.h>
 
 #include "sleep.h" /* To include x86_acpi_suspend_lowlevel */
-static int __initdata acpi_force = 0;
+static int acpi_force __initdata = 0;
 u32 acpi_rsdt_forced;
 int acpi_disabled;
 EXPORT_SYMBOL(acpi_disabled);
@@ -743,7 +743,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)
 {
@@ -820,7 +820,7 @@  static int __init acpi_parse_hpet(struct acpi_table_header *table)
  * hpet_insert_resource inserts the HPET resources used into the resource
  * tree.
  */
-static __init int hpet_insert_resource(void)
+static int __init hpet_insert_resource(void)
 {
 	if (!hpet_res)
 		return 1;
@@ -1360,7 +1360,7 @@  static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
  * If your system is blacklisted here, but you find that acpi=force
  * works for you, please contact linux-acpi@vger.kernel.org
  */
-static struct dmi_system_id __initdata acpi_dmi_table[] = {
+static struct dmi_system_id acpi_dmi_table[] __initdata = {
 	/*
 	 * Boxes that need ACPI disabled
 	 */
@@ -1435,7 +1435,7 @@  static struct dmi_system_id __initdata acpi_dmi_table[] = {
 };
 
 /* second table for DMI checks that should run after early-quirks */
-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
+static struct dmi_system_id acpi_dmi_table_late[] __initdata = {
 	/*
 	 * HP laptops which use a DSDT reporting as HP/SB400/10000,
 	 * which includes some code which overrides all temperature