---

yaml --- r: 367957 b: refs/heads/master c: 0d3ab45 h: refs/heads/master i: 367955: 45d6a93 v: v3
git-mirror · May 1, 2013 · 54a8a8f · 54a8a8f
1 parent d7d175a
commit 54a8a8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}