From 54a8a8fed3ad289cc6bbcab7a77331b4323ed982 Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@codeaurora.org>
Date: Tue, 23 Oct 2012 18:26:20 -0500
Subject: [PATCH] --- yaml --- r: 367957 b: refs/heads/master c:
 0d3ab450a786a87412ecc57657a3c327efb8c6fe h: refs/heads/master i:   367955:
 45d6a9329423db521f50e3a1d6be0cde2619db68 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/hexagon/kernel/process.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d0753fbcc233..cee68cde7e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c05c3ec401a68888f23f489b7bd6f88117836bc9
+refs/heads/master: 0d3ab450a786a87412ecc57657a3c327efb8c6fe
diff --git a/trunk/arch/hexagon/kernel/process.c b/trunk/arch/hexagon/kernel/process.c
index c300ce37267f..a91b290b923a 100644
--- a/trunk/arch/hexagon/kernel/process.c
+++ b/trunk/arch/hexagon/kernel/process.c
@@ -113,7 +113,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 	if (unlikely(p->flags & PF_KTHREAD)) {
 		memset(childregs, 0, sizeof(struct pt_regs));
 		/* r24 <- fn, r25 <- arg */
-		ss->r2524 = usp | ((u64)arg << 32);
+		ss->r24 = usp;
+		ss->r25 = arg;
 		pt_set_kmode(childregs);
 		return 0;
 	}