Current (FEC from 2.6.31 port, no CAN, no I2C, no PCI)

[mcf548x/linux.git] / arch / m68k / include / asm / segment.h

diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h
index ee959219fdfe0fb1698e456344eeedfa39271ca2..722e145618ac2c26a05ade5cc77cfe3d03d3a8ea 100644 (file)
--- a/arch/m68k/include/asm/segment.h
+++ b/arch/m68k/include/asm/segment.h
@@ -29,6 +29,8 @@ typedef struct {
  * Get/set the SFC/DFC registers for MOVES instructions
  */
 
+#ifndef CONFIG_COLDFIRE 
+
 static inline mm_segment_t get_fs(void)
 {
 #ifdef CONFIG_MMU
@@ -56,6 +58,15 @@ static inline void set_fs(mm_segment_t val)
 #endif
 }
 
+#else /* CONFIG_COLDFIRE */
+
+#include <asm/current.h>
+#define get_fs()        (current->thread.fs)
+#define set_fs(val)     (current->thread.fs = (val))
+#define get_ds()        (KERNEL_DS)
+
+#endif /* CONFIG_COLDFIRE */
+
 #define segment_eq(a,b)        ((a).seg == (b).seg)
 
 #endif /* __ASSEMBLY__ */