diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /arch/ppc64/mm/hash_low.S | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
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) |