diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/i386/mm/fault.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
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 | ||