diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-20 11:07:56 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-20 11:07:56 +1000 |
| commit | 4f0dbc2781b9dc457159b676289f874ab2dc3560 (patch) | |
| tree | 2b8af0f301eaf0bc47d643b99d48a84611b4bed3 /arch/powerpc/include | |
| parent | 3c15a68880023722fc794018768df556f438ae98 (diff) | |
| parent | 20002ded4d937ca87aca6253b874920a96a763c4 (diff) | |
| download | blackbird-op-linux-4f0dbc2781b9dc457159b676289f874ab2dc3560.tar.gz blackbird-op-linux-4f0dbc2781b9dc457159b676289f874ab2dc3560.zip | |
Merge commit 'paulus-perf/master' into next
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/pgtable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index eb17da781128..2a5da069714e 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -104,8 +104,8 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, else pte_update(ptep, ~_PAGE_HASHPTE, pte_val(pte)); -#elif defined(CONFIG_PPC32) && defined(CONFIG_PTE_64BIT) && defined(CONFIG_SMP) - /* Second case is 32-bit with 64-bit PTE in SMP mode. In this case, we +#elif defined(CONFIG_PPC32) && defined(CONFIG_PTE_64BIT) + /* Second case is 32-bit with 64-bit PTE. In this case, we * can just store as long as we do the two halves in the right order * with a barrier in between. This is possible because we take care, * in the hash code, to pre-invalidate if the PTE was already hashed, @@ -140,7 +140,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, #else /* Anything else just stores the PTE normally. That covers all 64-bit - * cases, and 32-bit non-hash with 64-bit PTEs in UP mode + * cases, and 32-bit non-hash with 32-bit PTEs. */ *ptep = pte; #endif |
