diff --git a/[refs] b/[refs]
index 612a422ed241..3b30a7871da0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e31c243f984628d02f045dc4b622f1e2827860dc
+refs/heads/master: ed9b949f55bc8a6bb6083ce0eddb53d06aee302a
diff --git a/trunk/arch/frv/kernel/head.inc b/trunk/arch/frv/kernel/head.inc
index d424cd2eb213..bff66628b99a 100644
--- a/trunk/arch/frv/kernel/head.inc
+++ b/trunk/arch/frv/kernel/head.inc
@@ -46,5 +46,5 @@
 #ifdef CONFIG_MMU
 __sdram_base = 0x00000000		/* base address to which SDRAM relocated */
 #else
-__sdram_base = 0xc0000000		/* base address to which SDRAM relocated */
+__sdram_base = __page_offset		/* base address to which SDRAM relocated */
 #endif
diff --git a/trunk/arch/frv/kernel/switch_to.S b/trunk/arch/frv/kernel/switch_to.S
index b5275fa9cd0d..b06668670fcc 100644
--- a/trunk/arch/frv/kernel/switch_to.S
+++ b/trunk/arch/frv/kernel/switch_to.S
@@ -102,13 +102,6 @@ __switch_to:
 	movgs		gr14,lr
 	bar
 
-	srli		gr15,#28,gr5
-	subicc		gr5,#0xc,gr0,icc0
-	beq		icc0,#0,111f
-	break
-	nop
-111:
-
 	# jump to __switch_back or ret_from_fork as appropriate
 	# - move prev to GR8
 	movgs		gr4,psr