---

yaml
---
r: 188475
b: refs/heads/master
c: aad16f3
h: refs/heads/master
i:
  188473: 1b91bb5
  188471: 9b08705
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8916a1499d958fcb9086a2c49a5fa3000689bb81
+refs/heads/master: aad16f32284030907b4f105e92e5fb534fd272bc

trunk/arch/blackfin/mach-common/head.S

@@ -144,8 +144,8 @@ ENTRY(__start)
 #endif
 
 	/* Initialize stack pointer */
-	sp.l = _init_thread_union;
-	sp.h = _init_thread_union;
+	sp.l = _init_thread_union + THREAD_SIZE;
+	sp.h = _init_thread_union + THREAD_SIZE;
 	fp = sp;
 	usp = sp;
 
@@ -257,12 +257,7 @@ ENTRY(_real_start)
 	R0 = R7;
 	call _cmdline_init;
 
-	/* Load the current thread pointer and stack */
-	p1 = THREAD_SIZE + 4 (z);	/* +4 is for reti loading */
-	sp = sp + p1;
-	usp = sp;
-	fp = sp;
-	sp += -12;
+	sp += -12 + 4; /* +4 is for reti loading above */
 	call _init_pda
 	sp += 12;
 	jump.l _start_kernel;