linux-kernel - [tip:x86/acpi] X86 ACPI: Use #ifdef not #if for CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a@git.kernel.org>
Date:	Fri, 5 Oct 2012 17:20:01 -0700
From:	"tip-bot for Luck, Tony" <tony.luck@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	lenb@...nel.org, trenn@...e.de, tony.luck@...el.com,
	tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/acpi] X86 ACPI: Use #ifdef not #if for CONFIG_X86 check

Commit-ID:  385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a
Gitweb:     http://git.kernel.org/tip/385ddeac7ed99cf7dc62d76274d55fbd7cae1b5a
Author:     Luck, Tony <tony.luck@...el.com>
AuthorDate: Fri, 5 Oct 2012 15:05:34 -0700
Committer:  H. Peter Anvin <hpa@...ux.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@...el.com>
Link: http://lkml.kernel.org/r/506f59ae9600b36a4@agluck-desktop.sc.intel.com
Cc: Len Brown <lenb@...nel.org>
Cc: Thomas Renninger <trenn@...e.de>
Signed-off-by: H. Peter Anvin <hpa@...ux.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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/