git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
ia64
/
sn
/
kernel
/
setup.c
diff --git
a/arch/ia64/sn/kernel/setup.c
b/arch/ia64/sn/kernel/setup.c
index
30988df
..
5b84836
100644
(file)
--- 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.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999,2001-200
6
Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-200
5
Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/config.h>
*/
#include <linux/config.h>
@@
-327,11
+327,10
@@
sn_scan_pcdp(void)
struct pcdp_interface_pci if_pci;
extern struct efi efi;
struct pcdp_interface_pci if_pci;
extern struct efi efi;
- if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
+ pcdp = efi.hcdp;
+ if (! pcdp)
return; /* no hcdp/pcdp table */
return; /* no hcdp/pcdp table */
- pcdp = __va(efi.hcdp);
-
if (pcdp->rev < 3)
return; /* only support PCDP (rev >= 3) */
if (pcdp->rev < 3)
return; /* only support PCDP (rev >= 3) */
@@
-499,7
+498,6
@@
void __init sn_setup(char **cmdline_p)
* for sn.
*/
pm_power_off = ia64_sn_power_down;
* for sn.
*/
pm_power_off = ia64_sn_power_down;
- current->thread.flags |= IA64_THREAD_MIGRATION;
}
/**
}
/**
@@
-662,8
+660,7
@@
void __init sn_cpu_init(void)
SH2_PIO_WRITE_STATUS_1, SH2_PIO_WRITE_STATUS_3};
u64 *pio;
pio = is_shub1() ? pio1 : pio2;
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 *)GLOBAL_MMR_ADDR(nasid, pio[slice]);
+ pda->pio_write_status_addr = (volatile unsigned long *) LOCAL_MMR_ADDR(pio[slice]);
pda->pio_write_status_val = is_shub1() ? SH_PIO_WRITE_STATUS_PENDING_WRITE_COUNT_MASK : 0;
}
pda->pio_write_status_val = is_shub1() ? SH_PIO_WRITE_STATUS_PENDING_WRITE_COUNT_MASK : 0;
}