diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /arch/ppc64/mm/hash_low.S | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'arch/ppc64/mm/hash_low.S')
| -rw-r--r-- | arch/ppc64/mm/hash_low.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S index fbff24827ae7..35eb49e1b890 100644 --- a/arch/ppc64/mm/hash_low.S +++ b/arch/ppc64/mm/hash_low.S | |||
| @@ -129,12 +129,10 @@ _GLOBAL(__hash_page) | |||
| 129 | * code rather than call a C function...) | 129 | * code rather than call a C function...) |
| 130 | */ | 130 | */ |
| 131 | BEGIN_FTR_SECTION | 131 | BEGIN_FTR_SECTION |
| 132 | BEGIN_FTR_SECTION | ||
| 133 | mr r4,r30 | 132 | mr r4,r30 |
| 134 | mr r5,r7 | 133 | mr r5,r7 |
| 135 | bl .hash_page_do_lazy_icache | 134 | bl .hash_page_do_lazy_icache |
| 136 | END_FTR_SECTION_IFSET(CPU_FTR_NOEXECUTE) | 135 | END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE) |
| 137 | END_FTR_SECTION_IFCLR(CPU_FTR_COHERENT_ICACHE) | ||
| 138 | 136 | ||
| 139 | /* At this point, r3 contains new PP bits, save them in | 137 | /* At this point, r3 contains new PP bits, save them in |
| 140 | * place of "access" in the param area (sic) | 138 | * place of "access" in the param area (sic) |