From patchwork Wed Aug 21 08:46:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 19362 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 60DF0248E6 for ; Wed, 21 Aug 2013 08:51:56 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id a11sf114361qen.9 for ; Wed, 21 Aug 2013 01:51:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=sunHYKNIyql0uT44ZMqZRVhF20Z3D51Es/CPOiET390=; b=VyEBA5gtKvVYubrjbQcwYV61jD0qPTzxXceM8oQarKkUBnNWKSeRK5u6vruca4zPLj Z6ltXQeiJdBIaizLmMVey9S4BF08wkpxQ55OxdqwsRzWYpFKyJF49NTKfk/a8yr/QnOU iS5oEJbF7Z8b4AIGpY4sxA9ukTqGd5QPjFxbVW02VqP/YElL3V+1nVogyIoX4IEZoDsA +ETzO3LcqWKjnYc645ZG9Io2dTK02e6TjQtgxbYSbOLi+za98yShLbBUNJuzYFWT84uS f/GumvMEdWFORxoXUpm1S3f+l/lOk3FGCmd7LiAzEnniHCr4a5wQnUgBW2POdnTIhuR/ uXbw== X-Received: by 10.236.132.163 with SMTP id o23mr2322678yhi.31.1377075116205; Wed, 21 Aug 2013 01:51:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.73.193 with SMTP id n1ls616198qev.50.gmail; Wed, 21 Aug 2013 01:51:56 -0700 (PDT) X-Received: by 10.58.165.70 with SMTP id yw6mr5485415veb.19.1377075116110; Wed, 21 Aug 2013 01:51:56 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id sy7si1802650vdc.40.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Aug 2013 01:51:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ht10so88048vcb.38 for ; Wed, 21 Aug 2013 01:51:55 -0700 (PDT) X-Gm-Message-State: ALoCoQkLGNxnFAoRyn0jti3H0lRK7gK4W/stPPRV+DjSGUQWrwBBljpHt5x8O5DoGB4A0QNRSX7b X-Received: by 10.220.181.136 with SMTP id by8mr5559146vcb.11.1377075115775; Wed, 21 Aug 2013 01:51:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp207004vcz; Wed, 21 Aug 2013 01:51:55 -0700 (PDT) X-Received: by 10.66.218.198 with SMTP id pi6mr8530851pac.107.1377075114911; Wed, 21 Aug 2013 01:51:54 -0700 (PDT) Received: from hanjun-Latitude-D630 ([218.17.215.175]) by mx.google.com with ESMTPS id oq6si5723831pac.265.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Aug 2013 01:51:54 -0700 (PDT) Received-SPF: neutral (google.com: 218.17.215.175 is neither permitted nor denied by best guess record for domain of hanjun@hanjun-latitude-d630) client-ip=218.17.215.175; Received: from hanjun-Latitude-D630 (localhost [127.0.0.1]) by hanjun-Latitude-D630 (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id r7L8mp4c010686; Wed, 21 Aug 2013 16:48:51 +0800 Received: (from hanjun@localhost) by hanjun-Latitude-D630 (8.14.4/8.14.4/Submit) id r7L8mo4l010685; Wed, 21 Aug 2013 16:48:50 +0800 From: Hanjun Guo To: "Rafael J. Wysocki" , Thomas Gleixner Cc: Ingo Molnar , x86@kernel.org, linux-pm@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH 2/3] x86 / ACPI: Fix __initdata and __init attribute locations in boot.c Date: Wed, 21 Aug 2013 16:46:16 +0800 Message-Id: <1377074777-10639-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377074777-10639-1-git-send-email-hanjun.guo@linaro.org> References: <1377074777-10639-1-git-send-email-hanjun.guo@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , __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 --- arch/x86/kernel/acpi/boot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 #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 -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