[parisc-linux] RE: [parisc-linux-cvs] linux-2.6 carlos

[Randolph Chung]

> Sorry for auto-reply but my suspicious was right: I just revert this patch:

can you try this one instead?

randolph

Index: arch/parisc/kernel/head64.S
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/head64.S,v
retrieving revision 1.3
diff -u -p -r1.3 head64.S
--- arch/parisc/kernel/head64.S 17 Jan 2004 15:00:32 -0000      1.3
+++ arch/parisc/kernel/head64.S 1 Feb 2004 18:09:13 -0000
@@ -165,8 +165,7 @@ common_stext:
 #endif /* CONFIG_SMP */

        /* Save the rfi target address */
-       ldo             -THREAD_SZ_ALGN(%sp), %r1
-       ldd             TI_TASK(%r1), %r1
+       ldd             TI_TASK-THREAD_SZ_ALGN(%sp), %r1
        std             %r11,  TASK_PT_GR11(%r1)

 #ifndef CONFIG_PDC_NARROW
@@ -301,7 +300,8 @@ smp_slave_stext:

        /*  Initialize the SP - monarch sets up smp_init_current_idle_task */
        load32          PA(smp_init_current_idle_task),%sp
-       ldd             0(%sp),%sp      /* load task address */
+       ldd             0(%sp),%sp      /* load thread_info address */
+       ldd             TASK_THREAD_INFO(%sp), %sp
        mtctl           %sp,%cr30       /* store in cr30 */
        ldo             THREAD_SZ_ALGN(%sp),%sp
        tophys_r1       %sp