linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-next@vger.kernel.org
Subject: linux-next: manual merge of the x86 tree with Linus' tree
Date: Tue, 24 Feb 2009 12:21:20 +1100	[thread overview]
Message-ID: <20090224122120.b03d701a.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/mach-default/setup.c between commit
936577c61d0c10b8929608a92c98d839b22053bc ("x86: Add IRQF_TIMER to legacy
x86 timer interrupt descriptors") from Linus' tree and commit
6bda2c8b32febeb38ee128047253751e080bad52 ("x86: remove subarchitecture
support") from the x86 tree.

I fixed it up by removing arch/x86/mach-default/setup.c and applying the
following patch (I am not sure if that is all that is necessary) and can
carry this for a while.
-- 
Cheers,
Stephen Rothwell

diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 22337b7..31493c5 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -333,7 +333,7 @@ void __init trap_init_hook(void)
 
 static struct irqaction irq0  = {
 	.handler = timer_interrupt,
-	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL,
+	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
 	.mask = CPU_MASK_NONE,
 	.name = "timer"
 };

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

             reply	other threads:[~2009-02-24  1:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-24  1:21 Stephen Rothwell [this message]
2009-05-26  0:52 linux-next: manual merge of the x86 tree with Linus' tree Stephen Rothwell
2009-05-26  0:56 ` H. Peter Anvin

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=20090224122120.b03d701a.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=hpa@zytor.com \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).