diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 13:26:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 13:26:16 -0700 |
commit | 86c65a7857896b1de99628ad392556965c4841e6 (patch) | |
tree | 8cb153af048348261f7244600076a44354ec94c9 /arch/powerpc/mm/hash_low_64.S | |
parent | 20a52d4f5998f4804af7c27651490647da62fd08 (diff) | |
parent | 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 (diff) | |
download | kernel_samsung_smdk4412-86c65a7857896b1de99628ad392556965c4841e6.zip kernel_samsung_smdk4412-86c65a7857896b1de99628ad392556965c4841e6.tar.gz kernel_samsung_smdk4412-86c65a7857896b1de99628ad392556965c4841e6.tar.bz2 |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
powerpc: Fix erroneous lmb->memblock conversions
powerpc/mm: Add some debug output when hash insertion fails
powerpc/mm: Fix bugs in huge page hashing
powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
powerpc/kexec: Fix boundary case for book-e kexec memory limits
Diffstat (limited to 'arch/powerpc/mm/hash_low_64.S')
-rw-r--r-- | arch/powerpc/mm/hash_low_64.S | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S index a719f53..3079f6b 100644 --- a/arch/powerpc/mm/hash_low_64.S +++ b/arch/powerpc/mm/hash_low_64.S @@ -68,9 +68,6 @@ _GLOBAL(__hash_page_4K) std r8,STK_PARM(r8)(r1) std r9,STK_PARM(r9)(r1) - /* Add _PAGE_PRESENT to access */ - ori r4,r4,_PAGE_PRESENT - /* Save non-volatile registers. * r31 will hold "old PTE" * r30 is "new PTE" @@ -347,9 +344,6 @@ _GLOBAL(__hash_page_4K) std r8,STK_PARM(r8)(r1) std r9,STK_PARM(r9)(r1) - /* Add _PAGE_PRESENT to access */ - ori r4,r4,_PAGE_PRESENT - /* Save non-volatile registers. * r31 will hold "old PTE" * r30 is "new PTE" @@ -687,9 +681,6 @@ _GLOBAL(__hash_page_64K) std r8,STK_PARM(r8)(r1) std r9,STK_PARM(r9)(r1) - /* Add _PAGE_PRESENT to access */ - ori r4,r4,_PAGE_PRESENT - /* Save non-volatile registers. * r31 will hold "old PTE" * r30 is "new PTE" |