Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 254e0a6b authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86: Use get_desc_base() 



Use get_desc_base() to get the base address in desc_struct

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718150853.GA11294@localhost.localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 78af08d9

arch/x86/kernel/doublefault_32.c

+1 −3
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ static void doublefault_fn(void) 


	if (ptr_ok(gdt)) {

		gdt += GDT_ENTRY_TSS << 3;

		tss = *(u16 *)(gdt+2);

		tss += *(u8 *)(gdt+4) << 16;

		tss += *(u8 *)(gdt+7) << 24;

		tss = get_desc_base((struct desc_struct *)gdt);

		printk(KERN_EMERG "double fault, tss at %08lx\n", tss);



		if (ptr_ok(tss)) {

arch/x86/kernel/step.c

+4 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/ptrace.h>

#include <asm/desc.h>



unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs)

{
@@ -23,7 +24,7 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re 
	 * and APM bios ones we just ignore here.

	 */

	if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) {

		u32 *desc;

		struct desc_struct *desc;

		unsigned long base;



		seg &= ~7UL;
@@ -33,12 +34,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re 
			addr = -1L; /* bogus selector, access would fault */

		else {

			desc = child->mm->context.ldt + seg;

			base = ((desc[0] >> 16) |

				((desc[1] & 0xff) << 16) |

				(desc[1] & 0xff000000));

			base = get_desc_base(desc);



			/* 16-bit code segment? */

			if (!((desc[1] >> 22) & 1))

			if (!desc->d)

				addr &= 0xffff;

			addr += base;

		}