From: "tip-bot for Luck, Tony" <tony.luck@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
lenb@kernel.org, trenn@suse.de, tony.luck@intel.com,
tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/acpi] X86 ACPI: Use #ifdef not #if for CONFIG_X86 check
Date: Fri, 5 Oct 2012 17:20:01 -0700 [thread overview]
Message-ID: <tip-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a@git.kernel.org> (raw)
In-Reply-To: <506f59ae9600b36a4@agluck-desktop.sc.intel.com>
Commit-ID: 385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a
Gitweb: http://git.kernel.org/tip/385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a
Author: Luck, Tony <tony.luck@intel.com>
AuthorDate: Fri, 5 Oct 2012 15:05:34 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 5 Oct 2012 15:59:07 -0700
X86 ACPI: Use #ifdef not #if for CONFIG_X86 check
Fix a build warning on ia64:
include/linux/acpi.h:437:5: warning: "CONFIG_X86" is not defined
Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/506f59ae9600b36a4@agluck-desktop.sc.intel.com
Cc: Len Brown <lenb@kernel.org>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
include/linux/acpi.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d14081c..49fe586 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -434,7 +434,7 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
acpi_status acpi_os_prepare_sleep(u8 sleep_state,
u32 pm1a_control, u32 pm1b_control);
-#if CONFIG_X86
+#ifdef CONFIG_X86
void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
#else
static inline void arch_reserve_mem_area(acpi_physical_address addr,
next prev parent reply other threads:[~2012-10-06 0:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 14:55 [RESEND] Early cpio decoder and ACPI table override via initrd making use of it Thomas Renninger
2012-09-25 14:55 ` Thomas Renninger
[not found] ` <1348584961-1476-1-git-send-email-trenn-l3A5Bk7waGM@public.gmane.org>
2012-09-25 14:55 ` [PATCH 1/6] lib: Add early cpio decoder Thomas Renninger
2012-09-25 14:55 ` Thomas Renninger
2012-09-25 14:55 ` [PATCH 2/6] X86 ACPI: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling Thomas Renninger
2012-09-25 15:12 ` Thomas Renninger
2012-10-05 22:05 ` [PATCH] X86 ACPI: Use #ifdef not #if for CONFIG_X86 check Luck, Tony
2012-10-06 0:20 ` tip-bot for Luck, Tony [this message]
2012-09-25 14:55 ` [PATCH 3/6] ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas Thomas Renninger
[not found] ` <1348584961-1476-4-git-send-email-trenn-l3A5Bk7waGM@public.gmane.org>
2012-09-25 15:15 ` H. Peter Anvin
2012-09-25 15:15 ` H. Peter Anvin
2012-09-25 14:55 ` [PATCH 4/6] ACPI: Implement physical address table override Thomas Renninger
2012-09-25 14:56 ` [PATCH 5/6] ACPI: Create acpi_table_taint() function to avoid code duplication Thomas Renninger
2012-09-25 14:56 ` [PATCH 6/6] ACPI: Document ACPI table overriding via initrd Thomas Renninger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a@git.kernel.org \
--to=tony.luck@intel.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=trenn@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.