diff options
Diffstat (limited to 'arch/m68k/include/asm/segment.h')
-rw-r--r-- | arch/m68k/include/asm/segment.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h index ee959219fdfe..0fa80e97ed2d 100644 --- a/arch/m68k/include/asm/segment.h +++ b/arch/m68k/include/asm/segment.h | |||
@@ -22,23 +22,26 @@ typedef struct { | |||
22 | } mm_segment_t; | 22 | } mm_segment_t; |
23 | 23 | ||
24 | #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) | 24 | #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) |
25 | #define USER_DS MAKE_MM_SEG(__USER_DS) | ||
26 | #define KERNEL_DS MAKE_MM_SEG(__KERNEL_DS) | ||
27 | 25 | ||
26 | #ifdef CONFIG_CPU_HAS_ADDRESS_SPACES | ||
28 | /* | 27 | /* |
29 | * Get/set the SFC/DFC registers for MOVES instructions | 28 | * Get/set the SFC/DFC registers for MOVES instructions |
30 | */ | 29 | */ |
30 | #define USER_DS MAKE_MM_SEG(__USER_DS) | ||
31 | #define KERNEL_DS MAKE_MM_SEG(__KERNEL_DS) | ||
31 | 32 | ||
32 | static inline mm_segment_t get_fs(void) | 33 | static inline mm_segment_t get_fs(void) |
33 | { | 34 | { |
34 | #ifdef CONFIG_MMU | ||
35 | mm_segment_t _v; | 35 | mm_segment_t _v; |
36 | __asm__ ("movec %/dfc,%0":"=r" (_v.seg):); | 36 | __asm__ ("movec %/dfc,%0":"=r" (_v.seg):); |
37 | |||
38 | return _v; | 37 | return _v; |
39 | #else | 38 | } |
40 | return USER_DS; | 39 | |
41 | #endif | 40 | static inline void set_fs(mm_segment_t val) |
41 | { | ||
42 | __asm__ __volatile__ ("movec %0,%/sfc\n\t" | ||
43 | "movec %0,%/dfc\n\t" | ||
44 | : /* no outputs */ : "r" (val.seg) : "memory"); | ||
42 | } | 45 | } |
43 | 46 | ||
44 | static inline mm_segment_t get_ds(void) | 47 | static inline mm_segment_t get_ds(void) |
@@ -47,14 +50,13 @@ static inline mm_segment_t get_ds(void) | |||
47 | return KERNEL_DS; | 50 | return KERNEL_DS; |
48 | } | 51 | } |
49 | 52 | ||
50 | static inline void set_fs(mm_segment_t val) | 53 | #else |
51 | { | 54 | #define USER_DS MAKE_MM_SEG(TASK_SIZE) |
52 | #ifdef CONFIG_MMU | 55 | #define KERNEL_DS MAKE_MM_SEG(0xFFFFFFFF) |
53 | __asm__ __volatile__ ("movec %0,%/sfc\n\t" | 56 | #define get_ds() (KERNEL_DS) |
54 | "movec %0,%/dfc\n\t" | 57 | #define get_fs() (current_thread_info()->addr_limit) |
55 | : /* no outputs */ : "r" (val.seg) : "memory"); | 58 | #define set_fs(x) (current_thread_info()->addr_limit = (x)) |
56 | #endif | 59 | #endif |
57 | } | ||
58 | 60 | ||
59 | #define segment_eq(a,b) ((a).seg == (b).seg) | 61 | #define segment_eq(a,b) ((a).seg == (b).seg) |
60 | 62 | ||