diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/i386/mm/fault.c | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/i386/mm/fault.c')
| -rw-r--r-- | arch/i386/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c index 9edd4485b91e..cf572d9a3b6e 100644 --- a/arch/i386/mm/fault.c +++ b/arch/i386/mm/fault.c | |||
| @@ -108,7 +108,7 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs, | |||
| 108 | desc = (void *)desc + (seg & ~7); | 108 | desc = (void *)desc + (seg & ~7); |
| 109 | } else { | 109 | } else { |
| 110 | /* Must disable preemption while reading the GDT. */ | 110 | /* Must disable preemption while reading the GDT. */ |
| 111 | desc = (u32 *)&per_cpu(cpu_gdt_table, get_cpu()); | 111 | desc = (u32 *)get_cpu_gdt_table(get_cpu()); |
| 112 | desc = (void *)desc + (seg & ~7); | 112 | desc = (void *)desc + (seg & ~7); |
| 113 | } | 113 | } |
| 114 | 114 | ||