]> err.no Git - linux-2.6/commitdiff
[IA64-SGI] - New SN hardware support - boot_init_shub2
authorJack Steiner <steiner@sgi.com>
Thu, 11 Aug 2005 17:26:00 +0000 (10:26 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 17 Aug 2005 22:30:14 +0000 (15:30 -0700)
Update the addresses of the pio_write_status_addr so that
they are correct for newer processors. Shub2 did not number
the threads in the order that I had expected.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/sn/kernel/setup.c

index 7c7fe441d62371ec513365bd89814397e0888b2e..ed77715393efb1389c03a37934ca21efeb498ba8 100644 (file)
@@ -532,8 +532,8 @@ void __init sn_cpu_init(void)
         */
        {
                u64 pio1[] = {SH1_PIO_WRITE_STATUS_0, 0, SH1_PIO_WRITE_STATUS_1, 0};
-               u64 pio2[] = {SH2_PIO_WRITE_STATUS_0, SH2_PIO_WRITE_STATUS_1,
-                       SH2_PIO_WRITE_STATUS_2, SH2_PIO_WRITE_STATUS_3};
+               u64 pio2[] = {SH2_PIO_WRITE_STATUS_0, SH2_PIO_WRITE_STATUS_2,
+                       SH2_PIO_WRITE_STATUS_1, SH2_PIO_WRITE_STATUS_3};
                u64 *pio;
                pio = is_shub1() ? pio1 : pio2;
                pda->pio_write_status_addr = (volatile unsigned long *) LOCAL_MMR_ADDR(pio[slice]);