diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/xtensa/mm/misc.S | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/xtensa/mm/misc.S')
| -rw-r--r-- | arch/xtensa/mm/misc.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S index e1f880368e32..c885664211d1 100644 --- a/arch/xtensa/mm/misc.S +++ b/arch/xtensa/mm/misc.S | |||
| @@ -295,7 +295,7 @@ ENTRY(__tlbtemp_mapping_itlb) | |||
| 295 | ENTRY(__invalidate_icache_page_alias) | 295 | ENTRY(__invalidate_icache_page_alias) |
| 296 | entry sp, 16 | 296 | entry sp, 16 |
| 297 | 297 | ||
| 298 | addi a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE) | 298 | addi a6, a3, (PAGE_KERNEL_EXEC | _PAGE_HW_WRITE) |
| 299 | mov a4, a2 | 299 | mov a4, a2 |
| 300 | witlb a6, a2 | 300 | witlb a6, a2 |
| 301 | isync | 301 | isync |