linux-next: manual merge of the x86 tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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: pgpH4WouBKv9x.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux