From 7a9e31c9ab0b0d14aff81147944848059a433a76 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 7 Aug 2008 22:36:59 +0100 Subject: [PATCH] --- yaml --- r: 108066 b: refs/heads/master c: 058ddee5625ade9e9e011b9ae155ac3b8d4eda3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/smp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e3e18208df3e..fded6a2e4ecd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 +refs/heads/master: 058ddee5625ade9e9e011b9ae155ac3b8d4eda3a diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 5a7c09564d13..e9842f6767f9 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -100,7 +100,7 @@ int __cpuinit __cpu_up(unsigned int cpu) * a 1:1 mapping for the physical address of the kernel. */ pgd = pgd_alloc(&init_mm); - pmd = pmd_offset(pgd, PHYS_OFFSET); + pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET); *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) | PMD_TYPE_SECT | PMD_SECT_AP_WRITE); @@ -139,7 +139,7 @@ int __cpuinit __cpu_up(unsigned int cpu) secondary_data.stack = NULL; secondary_data.pgdir = 0; - *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0); + *pmd = __pmd(0); pgd_free(&init_mm, pgd); if (ret) {