Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[cascardo/linux.git] / arch / frv / include / asm / segment.h

diff --git a/arch/frv/include/asm/segment.h b/arch/frv/include/asm/segment.h
index 4377c89..2305142 100644 (file)
--- a/arch/frv/include/asm/segment.h
+++ b/arch/frv/include/asm/segment.h
@@ -32,7 +32,6 @@ typedef struct {
 #define get_ds()               (KERNEL_DS)
 #define get_fs()               (__current_thread_info->addr_limit)
 #define segment_eq(a, b)       ((a).seg == (b).seg)
-#define __kernel_ds_p()                segment_eq(get_fs(), KERNEL_DS)
 #define get_addr_limit()       (get_fs().seg)
 
 #define set_fs(_x)                                     \