aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/fakeprom/main.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@sgi.com>2003-05-15 21:51:34 -0700
committerDavid Mosberger <davidm@tiger.hpl.hp.com>2003-05-15 21:51:34 -0700
commitc6bacd5010ec2db31aebbac71bc93540f40d2a9d (patch)
tree2ae09c178c75803efdac306845070c3aa0d41968 /arch/ia64/sn/fakeprom/main.c
parentf23ed56da68f6f611de827bbd8838d3ffce3b468 (diff)
downloadhistory-c6bacd5010ec2db31aebbac71bc93540f40d2a9d.tar.gz
[PATCH] ia64: SGI SN update
Diffstat (limited to 'arch/ia64/sn/fakeprom/main.c')
-rw-r--r--arch/ia64/sn/fakeprom/main.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/ia64/sn/fakeprom/main.c b/arch/ia64/sn/fakeprom/main.c
index 723aa51bb71d8..96df8ec276d05 100644
--- a/arch/ia64/sn/fakeprom/main.c
+++ b/arch/ia64/sn/fakeprom/main.c
@@ -4,7 +4,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2000-2001 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
*/
@@ -33,25 +33,9 @@ fmain(int lid, int bsp) {
* First lets figure out who we are. This is done from the
* LID passed to us.
*/
-
-#ifdef CONFIG_IA64_SGI_SN1
- nasid = (lid>>24);
- syn = (lid>>17)&1;
- cpu = (lid>>16)&1;
-
- /*
- * Now pick a synergy master to initialize synergy registers.
- */
- if (test_and_set_bit(syn, &nasidmaster[nasid]) == 0) {
- synergy_init(nasid, syn);
- test_and_set_bit(syn+2, &nasidmaster[nasid]);
- } else
- while (get_bit(syn+2, &nasidmaster[nasid]) == 0);
-#else
nasid = (lid>>16)&0xfff;
cpu = (lid>>28)&3;
syn = 0;
-#endif
/*
* Now pick a nasid master to initialize Bedrock registers.