From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Metcalf <cmetcalf@tilera.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Linus <torvalds@linux-foundation.org>
Subject: linux-next: manual merge of the tile tree with Linus' tree
Date: Mon, 2 Apr 2012 10:46:11 +1000 [thread overview]
Message-ID: <20120402104611.85a4f144ccaa4a2511cf2d4b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]
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@canb.auug.org.au>
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@canb.auug.org.au>
---
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-04-02 0:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-02 0:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-04-10 0:38 Stephen Rothwell
2012-04-10 0:34 Stephen Rothwell
2012-04-02 0:37 Stephen Rothwell
2012-03-14 0:10 Stephen Rothwell
2012-03-14 0:56 ` Chris Metcalf
2011-03-17 23:34 Stephen Rothwell
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=20120402104611.85a4f144ccaa4a2511cf2d4b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cmetcalf@tilera.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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
all inboxes | Powered by JetHome®