diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/tls.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/fault_32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c index 74d2b65a82eb..98f428be8e8c 100644 --- a/arch/x86/kernel/tls.c +++ b/arch/x86/kernel/tls.c | |||
@@ -112,7 +112,7 @@ int do_get_thread_area(struct task_struct *p, int idx, | |||
112 | 112 | ||
113 | memset(&info, 0, sizeof(struct user_desc)); | 113 | memset(&info, 0, sizeof(struct user_desc)); |
114 | info.entry_number = idx; | 114 | info.entry_number = idx; |
115 | info.base_addr = get_desc_base((void *)desc); | 115 | info.base_addr = get_desc_base((struct desc_struct *)desc); |
116 | info.limit = GET_LIMIT(desc); | 116 | info.limit = GET_LIMIT(desc); |
117 | info.seg_32bit = GET_32BIT(desc); | 117 | info.seg_32bit = GET_32BIT(desc); |
118 | info.contents = GET_CONTENTS(desc); | 118 | info.contents = GET_CONTENTS(desc); |
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c index 6056c6d71835..ef5ab2b925c4 100644 --- a/arch/x86/mm/fault_32.c +++ b/arch/x86/mm/fault_32.c | |||
@@ -115,7 +115,7 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs, | |||
115 | } | 115 | } |
116 | 116 | ||
117 | /* Decode the code segment base from the descriptor */ | 117 | /* Decode the code segment base from the descriptor */ |
118 | base = get_desc_base((unsigned long *)desc); | 118 | base = get_desc_base((struct desc_struct *)desc); |
119 | 119 | ||
120 | if (seg & (1<<2)) { | 120 | if (seg & (1<<2)) { |
121 | mutex_unlock(¤t->mm->context.lock); | 121 | mutex_unlock(¤t->mm->context.lock); |