diff options
author | Jack Steiner <steiner@sgi.com> | 2005-09-12 13:15:43 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-09-15 19:31:12 -0400 |
commit | 24ee0a6d7b0a52b140c880aae24c255de3b4a9a1 (patch) | |
tree | b57e06db620c9de7143baa58fc24a36ac24d5a79 /drivers/char/snsc.c | |
parent | 1619cca2921f6927f4240e03f413d4165c7002fc (diff) |
[IA64] Cleanup use of various #defines related to nodes
Some of the SN code & #defines related to compact nodes & IO discovery
have gotten stale over the years. This patch attempts to clean them up.
Some of the various SN MAX_xxx #defines were also unclear & misused.
The primary changes are:
- use MAX_NUMNODES. This is the generic linux #define for the number
of nodes that are known to the generic kernel. Arrays & loops
for constructs that are 1:1 with linux-defined nodes should
use the linux #define - not an SN equivalent.
- use MAX_COMPACT_NODES for MAX_NUMNODES + NUM_TIOS. This is the
number of nodes in the SSI system. Compact nodes are a hack to
get around the IA64 architectural limit of 256 nodes. Large SGI
systems have more than 256 nodes. When we upgrade to ACPI3.0,
I _hope_ that all nodes will be real nodes that are known to
the generic kernel. That will allow us to delete the notion
of "compact nodes".
- add MAX_NUMALINK_NODES for the total number of nodes that
are in the numalink domain - all partitions.
- simplified (understandable) scan_for_ionodes()
- small amount of cleanup related to cnodes
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/char/snsc.c')
-rw-r--r-- | drivers/char/snsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index 261a41bf6d02..a025a89ea70a 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c | |||
@@ -377,7 +377,7 @@ scdrv_init(void) | |||
377 | dev_t first_dev, dev; | 377 | dev_t first_dev, dev; |
378 | nasid_t event_nasid = ia64_sn_get_console_nasid(); | 378 | nasid_t event_nasid = ia64_sn_get_console_nasid(); |
379 | 379 | ||
380 | if (alloc_chrdev_region(&first_dev, 0, numionodes, | 380 | if (alloc_chrdev_region(&first_dev, 0, num_cnodes, |
381 | SYSCTL_BASENAME) < 0) { | 381 | SYSCTL_BASENAME) < 0) { |
382 | printk("%s: failed to register SN system controller device\n", | 382 | printk("%s: failed to register SN system controller device\n", |
383 | __FUNCTION__); | 383 | __FUNCTION__); |
@@ -385,7 +385,7 @@ scdrv_init(void) | |||
385 | } | 385 | } |
386 | snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME); | 386 | snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME); |
387 | 387 | ||
388 | for (cnode = 0; cnode < numionodes; cnode++) { | 388 | for (cnode = 0; cnode < num_cnodes; cnode++) { |
389 | geoid = cnodeid_get_geoid(cnode); | 389 | geoid = cnodeid_get_geoid(cnode); |
390 | devnamep = devname; | 390 | devnamep = devname; |
391 | format_module_id(devnamep, geo_module(geoid), | 391 | format_module_id(devnamep, geo_module(geoid), |