[PATCH] ia64: cannot convert region 5 address to physical by clearing bits 63:61

Another no-brainer bug fix snipped out of the quagmire of
the MCA/TLB patch.  This one is for 2.6 only, we must use
the new LOAD_PHYSICAL() macro to get the physical address of
the code label that we want to jump to, the INST_VA_TO_PA()
macro just clears the region bits, which only works for region
7 addresses.

diff --git a/include/asm-ia64/mca_asm.h b/include/asm-ia64/mca_asm.h
index bcca098828ed79d5bc5a659d8b172799aa0d62bc..2aa8437dcf75249fc19258f5af6cf92dba178b4a 100644 (file)
--- a/include/asm-ia64/mca_asm.h
+++ b/include/asm-ia64/mca_asm.h
@@ -110,10 +110,9 @@
        ;;                                                                              \
        dep     temp1 = -1, temp1, PSR_MC, 1;                                           \
        ;;                                                                              \
-       movl    temp2 = start_addr;                                                     \
        mov     cr.ipsr = temp1;                                                        \
        ;;                                                                              \
-       INST_VA_TO_PA(temp2);                                                           \
+       LOAD_PHYSICAL(p0, temp2, start_addr);                                           \
        ;;                                                                              \
        mov     cr.iip = temp2;                                                         \
        mov     cr.ifs = r0;                                                            \