[PATCH 16/19] modify get_desc_base

This patch makes get_desc_base() receive a struct desc_struct,
and then uses its internal fields to compute the base address.

Signed-off-by: Glauber de Oliveira Costa <gcosta@xxxxxxxxxx>
---
arch/x86/kernel/tls.c | 2 +-
arch/x86/mm/fault_32.c | 2 +-
include/asm-x86/desc.h | 8 ++------
3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 74d2b65..98f428b 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,

memset(&info, 0, sizeof(struct user_desc));
info.entry_number = idx;
- info.base_addr = get_desc_base((void *)desc);
+ info.base_addr = get_desc_base((struct desc_struct *)desc);
info.limit = GET_LIMIT(desc);
info.seg_32bit = GET_32BIT(desc);
info.contents = GET_CONTENTS(desc);
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 6056c6d..ef5ab2b 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,
}

/* Decode the code segment base from the descriptor */
- base = get_desc_base((unsigned long *)desc);
+ base = get_desc_base((struct desc_struct *)desc);

if (seg & (1<<2)) {
mutex_unlock(&current->mm->context.lock);
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
index 926d6f8..3480cb1 100644
--- a/include/asm-x86/desc.h
+++ b/include/asm-x86/desc.h
@@ -55,13 +55,9 @@ static inline void load_LDT(mm_context_t *pc)
preempt_enable();
}

-static inline unsigned long get_desc_base(unsigned long *desc)
+static inline unsigned long get_desc_base(struct desc_struct *desc)
{
- unsigned long base;
- base = ((desc[0] >> 16) & 0x0000ffff) |
- ((desc[1] << 16) & 0x00ff0000) |
- (desc[1] & 0xff000000);
- return base;
+ return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24);
}

#else
--
1.5.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • [PATCH 15/19] modify get_desc_base
    ... This patch makes get_desc_basereceive a struct desc_struct, ... and then uses its internal fields to compute the base address. ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • [2.6 patch] drivers/char/mxser.c: make some code static (fwd)
    ... Subject: [2.6 patch] drivers/char/mxser.c: make some code static ... The patch below makes a struct and a function that both were needlessly ... send the line "unsubscribe linux-kernel" in ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: [2.6 patch] mm/migrate.c: cleanups
    ... This patch has been sent on: ... struct page *, struct page *); ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • [PATCH 2.6.20] KVM: Use ARRAY_SIZE macro when appropriate
    ... A patch to use ARRAY_SIZE macro already defined in kernel.h ... struct vcpu_svm { ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • [PATCH 16/19] modify get_desc_base
    ... This patch makes get_desc_basereceive a struct desc_struct, ... and then uses its internal fields to compute the base address. ...
    (Linux-Kernel)