diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
| commit | 26ba2a7a9f4d8921f095af646a7d22c15a148028 (patch) | |
| tree | 1e694da6999653551bc61eb9cc6db2eb4645fcd1 /arch/ppc64 | |
| parent | 91190758d410a5d33c6051ba9ca95baa430256bb (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/kernel/mpic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/mpic.c b/arch/ppc64/kernel/mpic.c index cc262a05ddb..5f5bc73754d 100644 --- a/arch/ppc64/kernel/mpic.c +++ b/arch/ppc64/kernel/mpic.c @@ -506,8 +506,8 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr, mpic->senses_count = senses_count; /* Map the global registers */ - mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000); - mpic->tmregs = mpic->gregs + (MPIC_TIMER_BASE >> 2); + mpic->gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x2000); + mpic->tmregs = mpic->gregs + ((MPIC_TIMER_BASE - MPIC_GREG_BASE) >> 2); BUG_ON(mpic->gregs == NULL); /* Reset */ |