diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 14:18:08 -0500 |
| commit | 27710bf6febe8323f78bceca002ca7d71e5012a7 (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 /arch/avr32/mm/fault.c | |
| parent | 9ef64cb4320df821638b508f79aa8b858cca99f0 (diff) | |
| parent | cad226b8a71f969ad05137e43b48c9e6059a0b9f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/avr32/mm/fault.c')
| -rw-r--r-- | arch/avr32/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index 6560cb18b4e3..ce4e4296b954 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c | |||
| @@ -189,6 +189,8 @@ no_context: | |||
| 189 | 189 | ||
| 190 | page = sysreg_read(PTBR); | 190 | page = sysreg_read(PTBR); |
| 191 | printk(KERN_ALERT "ptbr = %08lx", page); | 191 | printk(KERN_ALERT "ptbr = %08lx", page); |
| 192 | if (address >= TASK_SIZE) | ||
| 193 | page = (unsigned long)swapper_pg_dir; | ||
| 192 | if (page) { | 194 | if (page) { |
| 193 | page = ((unsigned long *)page)[address >> 22]; | 195 | page = ((unsigned long *)page)[address >> 22]; |
| 194 | printk(" pgd = %08lx", page); | 196 | printk(" pgd = %08lx", page); |