linux-kernel - [tip:x86/cleanups] x86: Remove unnecessary #ifdef ACPI/X86_IO

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-0f1cf415f00286a38f5ce35b459342dbfc895b50@git.kernel.org>
Date:	Wed, 8 Sep 2010 08:35:47 GMT
From:	tip-bot for Christian Dietrich 
	<qy03fugy@...d.informatik.uni-erlangen.de>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	qy03fugy@...d.informatik.uni-erlangen.de, tglx@...utronix.de,
	mingo@...e.hu, borislav.petkov@....com
Subject: [tip:x86/cleanups] x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI

Commit-ID:  0f1cf415f00286a38f5ce35b459342dbfc895b50
Gitweb:     http://git.kernel.org/tip/0f1cf415f00286a38f5ce35b459342dbfc895b50
Author:     Christian Dietrich <qy03fugy@...d.informatik.uni-erlangen.de>
AuthorDate: Mon, 6 Sep 2010 16:36:18 +0200
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 8 Sep 2010 08:14:02 +0200

x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI

The ACPI/X86_IO_ACPI ifdef isn't necessary at this point,
because it is checked in an outer ifdef level already and has no
effect here.

Cleanup only, no functional effect.

Signed-off-by: Christian Dietrich <qy03fugy@...d.informatik.uni-erlangen.de>
Acked-by: Borislav Petkov <borislav.petkov@....com>
Cc: vamos-dev@...informatik.uni-erlangen.de
LKML-Reference: <d4376e6d79b8dc0f89a4b3ce4a880904a7b93ead.1283782701.git.qy03fugy@...d.informatik.uni-erlangen.de>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/x86/kernel/early-quirks.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index e5cc7e8..e4bd78c 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -98,7 +98,6 @@ static void __init nvidia_bugs(int num, int slot, int func)
 }
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
-#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
 static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 {
 	u32 d;
@@ -116,7 +115,6 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
 	d &= 0xff;
 	return d;
 }
-#endif
 
 static void __init ati_bugs(int num, int slot, int func)
 {
--
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/