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

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the tile tree got a conflict in
arch/tile/include/asm/barrier.h (actually setup.h - git tried its best)
between commit bd119c692393 ("Disintegrate asm/system.h for Tile") from
Linus' tree and commit 8507ce994794 ("arch/tile: fix hardwall for tilegx
and generalize for idn and ipi") from the tile tree.

I used the upstream version of barrier.h and applied the following merge
fixup.

It may be worth while rebasing the tile tree on top of v3.4-rc1 or
(maybe better) merging 3.4-rc1 into the tile tree.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 2 Apr 2012 10:41:41 +1000
Subject: [PATCH] tile: apply changes after system/h break up

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/tile/include/asm/setup.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h
index e58613e..c67eb70 100644
--- a/arch/tile/include/asm/setup.h
+++ b/arch/tile/include/asm/setup.h
@@ -41,15 +41,15 @@ void restrict_dma_mpls(void);
 #ifdef CONFIG_HARDWALL
 /* User-level network management functions */
 void reset_network_state(void);
-void grant_network_mpls(void);
-void restrict_network_mpls(void);
 struct task_struct;
-int hardwall_deactivate(struct task_struct *task);
+void hardwall_switch_tasks(struct task_struct *prev, struct task_struct *next);
+void hardwall_deactivate_all(struct task_struct *task);
+int hardwall_ipi_valid(int cpu);
 
 /* Hook hardwall code into changes in affinity. */
 #define arch_set_cpus_allowed(p, new_mask) do { \
-	if (p->thread.hardwall && !cpumask_equal(&p->cpus_allowed, new_mask)) \
-		hardwall_deactivate(p); \
+	if (!cpumask_equal(&p->cpus_allowed, new_mask)) \
+		hardwall_deactivate_all(p); \
 } while (0)
 #endif
 
-- 
1.7.10.rc3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature