diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/powerpc/mm | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_low_32.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index 7f830a4888d6..e10d76a860d3 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
| @@ -44,6 +44,9 @@ mmu_hash_lock: | |||
| 44 | #ifdef CONFIG_SMP | 44 | #ifdef CONFIG_SMP |
| 45 | .text | 45 | .text |
| 46 | _GLOBAL(hash_page_sync) | 46 | _GLOBAL(hash_page_sync) |
| 47 | mfmsr r10 | ||
| 48 | rlwinm r0,r10,0,17,15 /* clear bit 16 (MSR_EE) */ | ||
| 49 | mtmsr r0 | ||
| 47 | lis r8,mmu_hash_lock@h | 50 | lis r8,mmu_hash_lock@h |
| 48 | ori r8,r8,mmu_hash_lock@l | 51 | ori r8,r8,mmu_hash_lock@l |
| 49 | lis r0,0x0fff | 52 | lis r0,0x0fff |
| @@ -60,8 +63,9 @@ _GLOBAL(hash_page_sync) | |||
| 60 | eieio | 63 | eieio |
| 61 | li r0,0 | 64 | li r0,0 |
| 62 | stw r0,0(r8) | 65 | stw r0,0(r8) |
| 63 | blr | 66 | mtmsr r10 |
| 64 | #endif | 67 | blr |
| 68 | #endif /* CONFIG_SMP */ | ||
| 65 | 69 | ||
| 66 | /* | 70 | /* |
| 67 | * Load a PTE into the hash table, if possible. | 71 | * Load a PTE into the hash table, if possible. |