diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-03-21 08:21:26 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-21 08:21:26 -0800 |
| commit | 409761bb6a06bd61e2d8e27a1af534371d9537ed (patch) | |
| tree | 2c07068558092a01d70f737de9b9a34212a44d4b /arch/ia64/sn/kernel/setup.c | |
| parent | a4e817ba24d2a52f0332c2ddcdbf77ddd6a92bbe (diff) | |
| parent | e08e6c521355cd33e647b2f739885bc3050eead6 (diff) | |
| download | op-kernel-dev-409761bb6a06bd61e2d8e27a1af534371d9537ed.zip op-kernel-dev-409761bb6a06bd61e2d8e27a1af534371d9537ed.tar.gz | |
Pull sn2-mmio-writes into release branch
Hand-fixed conflicts:
include/asm-ia64/machvec_sn2.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 5b84836..8b6d5c8 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved. + * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved. */ #include <linux/config.h> @@ -498,6 +498,7 @@ void __init sn_setup(char **cmdline_p) * for sn. */ pm_power_off = ia64_sn_power_down; + current->thread.flags |= IA64_THREAD_MIGRATION; } /** @@ -660,7 +661,8 @@ void __init sn_cpu_init(void) 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]); + pda->pio_write_status_addr = + (volatile unsigned long *)GLOBAL_MMR_ADDR(nasid, pio[slice]); pda->pio_write_status_val = is_shub1() ? SH_PIO_WRITE_STATUS_PENDING_WRITE_COUNT_MASK : 0; } |
