From: tip-bot for Borislav Petkov <bp@alien8.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
torvalds@linux-foundation.org, bp@alien8.de,
jaswinderlinux@gmail.com, tglx@linutronix.de,
hpa@linux.intel.com, mingo@elte.hu
Subject: [tip:x86/urgent] x86-32, mm: Remove duplicated #include
Date: Tue, 26 Oct 2010 06:46:35 GMT [thread overview]
Message-ID: <tip-610470ce804f0326ca63fbcdc5be06b750debeb1@git.kernel.org> (raw)
In-Reply-To: <20101025162523.GA4712@a1.tnic>
Commit-ID: 610470ce804f0326ca63fbcdc5be06b750debeb1
Gitweb: http://git.kernel.org/tip/610470ce804f0326ca63fbcdc5be06b750debeb1
Author: Borislav Petkov <bp@alien8.de>
AuthorDate: Mon, 25 Oct 2010 18:25:23 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 25 Oct 2010 19:39:33 +0200
x86-32, mm: Remove duplicated #include
b40827fa7268fda8a62490728a61c2856f33830b added an include
directive which is needless and is taken care of by a previous
one. Remove it.
Caught-by: Jaswinder Singh Rajput <jaswinderlinux@gmail.com>
Signed-off-by: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jaswinder Singh Rajput <jaswinderlinux@gmail.com>
Cc: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <20101025162523.GA4712@a1.tnic>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/acpi/sleep.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 74a8478..69fd72a 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -15,7 +15,6 @@
#ifdef CONFIG_X86_32
#include <asm/pgtable.h>
-#include <asm/pgtable_32.h>
#endif
#include "realmode/wakeup.h"
prev parent reply other threads:[~2010-10-26 6:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-23 1:17 [GIT PULL] x86/trampoline for 2.6.37 H. Peter Anvin
2010-10-23 5:47 ` Jaswinder Singh Rajput
2010-10-23 9:24 ` Borislav Petkov
2010-10-23 14:15 ` Ingo Molnar
2010-10-25 16:25 ` [PATCH] x86-32, mm: Remove duplicated include Borislav Petkov
2010-10-26 6:46 ` tip-bot for Borislav Petkov [this message]
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-610470ce804f0326ca63fbcdc5be06b750debeb1@git.kernel.org \
--to=bp@alien8.de \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jaswinderlinux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox