diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-29 17:30:01 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-29 18:46:36 -0400 |
| commit | d6f703602fee8f8bd5c108af927a420cb8cb0d36 (patch) | |
| tree | 8cf02c27a3b0e1cf080260fa590411bd433804ee | |
| parent | 20bb25d10fe5569df8f3f186a36e5548582854d9 (diff) | |
[MIPS] do_page_fault() needs to use raw_smp_processor_id().
Original patch posted by Deepak Saxena <dsaxena@plexity.net>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/mm/fault.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index 6f90e7ef66ac..f9c595dceba9 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
| @@ -42,7 +42,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, | |||
| 42 | siginfo_t info; | 42 | siginfo_t info; |
| 43 | 43 | ||
| 44 | #if 0 | 44 | #if 0 |
| 45 | printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", smp_processor_id(), | 45 | printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", raw_smp_processor_id(), |
| 46 | current->comm, current->pid, field, address, write, | 46 | current->comm, current->pid, field, address, write, |
| 47 | field, regs->cp0_epc); | 47 | field, regs->cp0_epc); |
| 48 | #endif | 48 | #endif |
| @@ -165,7 +165,7 @@ no_context: | |||
| 165 | 165 | ||
| 166 | printk(KERN_ALERT "CPU %d Unable to handle kernel paging request at " | 166 | printk(KERN_ALERT "CPU %d Unable to handle kernel paging request at " |
| 167 | "virtual address %0*lx, epc == %0*lx, ra == %0*lx\n", | 167 | "virtual address %0*lx, epc == %0*lx, ra == %0*lx\n", |
| 168 | smp_processor_id(), field, address, field, regs->cp0_epc, | 168 | raw_smp_processor_id(), field, address, field, regs->cp0_epc, |
| 169 | field, regs->regs[31]); | 169 | field, regs->regs[31]); |
| 170 | die("Oops", regs); | 170 | die("Oops", regs); |
| 171 | 171 | ||
| @@ -228,7 +228,7 @@ vmalloc_fault: | |||
| 228 | pmd_t *pmd, *pmd_k; | 228 | pmd_t *pmd, *pmd_k; |
| 229 | pte_t *pte_k; | 229 | pte_t *pte_k; |
| 230 | 230 | ||
| 231 | pgd = (pgd_t *) pgd_current[smp_processor_id()] + offset; | 231 | pgd = (pgd_t *) pgd_current[raw_smp_processor_id()] + offset; |
| 232 | pgd_k = init_mm.pgd + offset; | 232 | pgd_k = init_mm.pgd + offset; |
| 233 | 233 | ||
| 234 | if (!pgd_present(*pgd_k)) | 234 | if (!pgd_present(*pgd_k)) |
