public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Jaswinder Singh Rajput <jaswinderlinux@gmail.com>,
	"H. Peter Anvin" <hpa@linux.intel.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] x86-32, mm: Remove duplicated include
Date: Mon, 25 Oct 2010 18:25:23 +0200	[thread overview]
Message-ID: <20101025162523.GA4712@a1.tnic> (raw)
In-Reply-To: <20101023141534.GC7768@elte.hu>

On Sat, Oct 23, 2010 at 04:15:34PM +0200, Ingo Molnar wrote:
> Please send a delta patch and we can do any trivial changes via the
> usual channels. The tree hpa sent to Linus is tested and this is
> tricky code.

Ok, here it is, 32-bit randconfig tested for a day.

--
From: Borislav Petkov <bp@alien8.de>
Date: Mon, 25 Oct 2010 18:15:22 +0200
Subject: [PATCH] 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>
---
 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"
-- 
1.7.1


-- 
Regards/Gruss,
Boris.

  reply	other threads:[~2010-10-25 16:25 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       ` Borislav Petkov [this message]
2010-10-26  6:46         ` [tip:x86/urgent] x86-32, mm: Remove duplicated #include tip-bot for Borislav Petkov

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=20101025162523.GA4712@a1.tnic \
    --to=bp@alien8.de \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jaswinderlinux@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --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