diff --git a/[refs] b/[refs]
index 855cca2295f2..b50e272dbaaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66dfe18114839a7297f56f43f03125f4121de79b
+refs/heads/master: 85247285ea6f6e2087193b2a720404690e9cb1b3
diff --git a/trunk/include/asm-sh/uaccess_64.h b/trunk/include/asm-sh/uaccess_64.h
index a9b68d094844..5833754dc747 100644
--- a/trunk/include/asm-sh/uaccess_64.h
+++ b/trunk/include/asm-sh/uaccess_64.h
@@ -26,25 +26,6 @@
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
 
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s)	((mm_segment_t) { (s) })
-
-#define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS		MAKE_MM_SEG(0x80000000)
-
-#define get_ds()	(KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit=(x))
-
-#define segment_eq(a,b)	((a).seg == (b).seg)
-
 #define __addr_ok(addr) ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
 
 /*