diff --git a/[refs] b/[refs]
index 1f4cab36a0a2..de1392592c1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea56f411ec2d4d8689eb7f3bcd24e860acf87c47
+refs/heads/master: 08dc179b9b00cfbed006ae6f5d0e471ef79dc69c
diff --git a/trunk/arch/frv/include/asm/segment.h b/trunk/arch/frv/include/asm/segment.h
index e3616a6f941d..a2320a4a0042 100644
--- a/trunk/arch/frv/include/asm/segment.h
+++ b/trunk/arch/frv/include/asm/segment.h
@@ -21,12 +21,12 @@ typedef struct {
 
 #define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })
 
-#define KERNEL_DS		MAKE_MM_SEG(0xdfffffffUL)
-
 #ifdef CONFIG_MMU
 #define USER_DS			MAKE_MM_SEG(TASK_SIZE - 1)
+#define KERNEL_DS		MAKE_MM_SEG(0xdfffffffUL)
 #else
-#define USER_DS			KERNEL_DS
+#define USER_DS			MAKE_MM_SEG(memory_end)
+#define KERNEL_DS		MAKE_MM_SEG(0xe0000000UL)
 #endif
 
 #define get_ds()		(KERNEL_DS)
diff --git a/trunk/arch/frv/include/asm/uaccess.h b/trunk/arch/frv/include/asm/uaccess.h
index 53650c958f41..0b67ec5b4414 100644
--- a/trunk/arch/frv/include/asm/uaccess.h
+++ b/trunk/arch/frv/include/asm/uaccess.h
@@ -27,8 +27,6 @@
 #define VERIFY_READ	0
 #define VERIFY_WRITE	1
 
-#define __addr_ok(addr) ((unsigned long)(addr) < get_addr_limit())
-
 /*
  * check that a range of addresses falls within the current address limit
  */