linux-next: manual merge of the rr tree with the x86 tree

linux-next: manual merge of the rr tree with the x86 tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/lguest/boot.c between commit
ccbeed3a05908d201b47b6c3dd1a373138bba566 ("x86: make lazy %gs optional on
x86_32") from the x86 tree and commit lguest_load_tls ("This patch allow
us to use KVM hypercalls") from the rr tree.

Just context changes.  I fixed it up (see below) and can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/lguest/boot.c
index 9fe4dda,4cb0674..0000000
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@@ -283,8 -311,8 +316,8 @@@ static void lguest_load_tls(struct thre
  	/* There's one problem which normal hardware doesn't have: the Host
  	 * can't handle us removing entries we're currently using.  So we clear
  	 * the GS register here: if it's needed it'll be reloaded anyway. */
 -	loadsegment(gs, 0);
 +	lazy_load_gs(0);
- 	lazy_hcall(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu, 0);
+ 	lazy_hcall2(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu);
  }
  
  /*G:038 That's enough excitement for now, back to ploughing through each of

linux-next: manual merge of the rr tree with the x86 tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/mach-default/setup.c between commit
6bda2c8b32febeb38ee128047253751e080bad52 ("x86: remove subarchitecture
support") from the x86 tree and commit
cafecba4dd4e08412d1141a260c38e35ca597710
("cpumask:irqaction-remove-unnecessary-initializers") from the rr tree.

The former moved the code that the latter changed.  I removed the
file and added the following patch.  I can carry this as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index e4630e2..eabdd9a 100644
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -82,7 +82,6 @@ void __init init_ISA_irqs(void)
  */
 static struct irqaction irq2 = {
 	.handler = no_action,
-	.mask = CPU_MASK_NONE,
 	.name = "cascade",
 };
 
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 31493c5..55150b1 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -334,7 +334,6 @@ void __init trap_init_hook(void)
 static struct irqaction irq0  = {
 	.handler = timer_interrupt,
 	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
-	.mask = CPU_MASK_NONE,
 	.name = "timer"
 };
 
@@ -367,7 +366,6 @@ void __init time_init_hook(void)
 			return;
 	}
 
-	irq0.mask = cpumask_of_cpu(0);
 	setup_irq(0, &irq0);
 }
 

linux-next: manual merge of the rr tree with the x86 tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/include/asm/numaq/apic.h between commit
5a44632f77a9c867621f7bf80c233eac75fea672 ("x86, numaq: consolidate code")
from the x86 tree and commit 2bd9413a5deca2b0b764cad0e23dfabd28cbf7fc
("cpumask:remove-address-of-CPU_MASK_ALL") from the rr tree.

The former moved all the code from that file into
arch/x86/mach-generic/numaq.c which was further consolidated into
arch/x86/kernel/numaq_32.c by commit
61b90b7ca10cc65d8b850ab542859dc593e5a381 ("x86, NUMAQ: Consolidate code").

I applied the following patch to the merge of the rr tree and can carry it
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 0cc41a1..6ed0834 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -363,7 +363,7 @@ numaq_store_NMI_vector(unsigned short *high, unsigned short *low)
 
 static inline const cpumask_t *numaq_target_cpus(void)
 {
-	return &CPU_MASK_ALL;
+	return cpu_all_mask;
 }
 
 static inline unsigned long

linux-next: manual merge of the rr tree with the x86 tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/x86/include/asm/es7000/apic.h between commit
018e047f3a98bd8d9e9d78b19bc38415f0c34dd7 ("x86, ES7000: consolidate the
APIC code") from the x86 tree and commit
2bd9413a5deca2b0b764cad0e23dfabd28cbf7fc
("cpumask:remove-address-of-CPU_MASK_ALL") from the rr tree.

The former moved all the code from that file into
arch/x86/mach-generic/es7000.c whcih was itself consolidated into
arch/x86/kernel/es7000_32.c by commit
2e096df8edefad78155bb406a5a86c182b17786e ("x86, ES7000: Consolidate
code") from the x86 tree.

So I added the following patch to the merge of the rr tree and can carry
it as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c
index d6184c1..1c6cabe 100644
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -471,7 +471,7 @@ static int es7000_apic_id_registered(void)
 
 static const cpumask_t *target_cpus_cluster(void)
 {
-	return &CPU_MASK_ALL;
+	return cpu_all_mask;
 }
 
 static const cpumask_t *es7000_target_cpus(void)