The patch titled
ia64-sn-xpc-convert-to-use-kthread-api-fix 2
has been added to the -mm tree. Its filename is
ia64-sn-xpc-convert-to-use-kthread-api-fix-2.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ia64-sn-xpc-convert-to-use-kthread-api-fix 2
From: Dean Nelson <dcn@xxxxxxx>
I've tested Eric's patch in conjunction with a fix from Christoph Lameter,
which you've already got (it cleaned up a couple of compiler errors), and
the following patch that I'd like added (it cleans up a couple of compiler
warning errors and makes a few cosmetic changes).
Signed-off-by: Dean Nelson <dcn@xxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/sn/kernel/xpc_main.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff -puN arch/ia64/sn/kernel/xpc_main.c~ia64-sn-xpc-convert-to-use-kthread-api-fix-2 arch/ia64/sn/kernel/xpc_main.c
--- a/arch/ia64/sn/kernel/xpc_main.c~ia64-sn-xpc-convert-to-use-kthread-api-fix-2
+++ a/arch/ia64/sn/kernel/xpc_main.c
@@ -568,7 +568,6 @@ xpc_activate_partition(struct xpc_partit
task = kthread_run(xpc_activating, (void *) ((u64) partid),
"xpc%02d", partid);
-
if (unlikely(IS_ERR(task))) {
spin_lock_irqsave(&part->act_lock, irq_flags);
part->act_state = XPC_P_INACTIVE;
@@ -808,7 +807,6 @@ xpc_create_kthreads(struct xpc_channel *
int ignore_disconnecting)
{
unsigned long irq_flags;
- pid_t pid;
u64 args = XPC_PACK_ARGS(ch->partid, ch->number);
struct xpc_partition *part = &xpc_partitions[ch->partid];
struct task_struct *task;
@@ -840,7 +838,7 @@ xpc_create_kthreads(struct xpc_channel *
(void) xpc_part_ref(part);
xpc_msgqueue_ref(ch);
- task = kthread_run(xpc_daemonize_kthread, args,
+ task = kthread_run(xpc_daemonize_kthread, (void *) args,
"xpc%02dc%d", ch->partid, ch->number);
if (IS_ERR(task)) {
/* the fork failed */
@@ -1381,7 +1379,8 @@ xpc_init(void)
* activate based on info provided by SAL. This new thread is short
* lived and will exit once discovery is complete.
*/
- task = kthread_run(xpc_initiate_discovery, NULL, XPC_DISCOVERY_THREAD_NAME);
+ task = kthread_run(xpc_initiate_discovery, NULL,
+ XPC_DISCOVERY_THREAD_NAME);
if (IS_ERR(task)) {
dev_err(xpc_part, "failed while forking discovery thread\n");
_
Patches currently in -mm which might be from dcn@xxxxxxx are
ia64-sn-xpc-convert-to-use-kthread-api-fix.patch
ia64-sn-xpc-convert-to-use-kthread-api-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
