diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:54 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-10-23 15:25:54 -0700 |
| commit | 0df341edfa5e7c119523a0c30146e88106f88b43 (patch) | |
| tree | b8a8bfabaa488d70ce49a7941e974bab023cb2d0 /arch/x86/math-emu/get_address.c | |
| parent | 9ac0b253c59216c9614436b2006d0557396eb268 (diff) | |
| parent | 205a8514e63a221c3a5071f27521013444e43e5f (diff) | |
Merge tag 'v4.1.11' into toradex_vf_4.1-next
This is the 4.1.11 stable release
Diffstat (limited to 'arch/x86/math-emu/get_address.c')
| -rw-r--r-- | arch/x86/math-emu/get_address.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/math-emu/get_address.c b/arch/x86/math-emu/get_address.c index 6ef5e99380f9..8300db71c2a6 100644 --- a/arch/x86/math-emu/get_address.c +++ b/arch/x86/math-emu/get_address.c @@ -20,7 +20,6 @@ #include <linux/stddef.h> #include <asm/uaccess.h> -#include <asm/desc.h> #include "fpu_system.h" #include "exception.h" @@ -158,7 +157,7 @@ static long pm_address(u_char FPU_modrm, u_char segment, addr->selector = PM_REG_(segment); } - descriptor = LDT_DESCRIPTOR(PM_REG_(segment)); + descriptor = FPU_get_ldt_descriptor(addr->selector); base_address = SEG_BASE_ADDR(descriptor); address = base_address + offset; limit = base_address |