diff options
| author | Dean Nelson | 2008-10-29 22:01:12 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-30 19:38:46 +0100 |
| commit | b7f7b07479de2d91443b81938db1e1940c56b13c (patch) | |
| tree | 67b967afb9700d1467294939ba9ea3223a19cef3 /drivers/misc/sgi-xp/xpc_main.c | |
| parent | 'kill sig -1' must only apply to caller's namespace (diff) | |
| download | kernel-qcow2-linux-b7f7b07479de2d91443b81938db1e1940c56b13c.tar.gz kernel-qcow2-linux-b7f7b07479de2d91443b81938db1e1940c56b13c.tar.xz kernel-qcow2-linux-b7f7b07479de2d91443b81938db1e1940c56b13c.zip | |
sgi-xp: only build for ia64-sn2 when CONFIG_IA64_GENERIC specified
For the time being build for ia64-sn2 alone when CONFIG_IA64_GENERIC is
specified.
This eliminates a dependency of the XP/XPC drivers on having the GRU
driver insmod'd in order to insmod them, when running on an ia64-sn2
system.
On such a system the GRU driver serves no useful purpose.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-xp/xpc_main.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xpc_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 46325fc84811..e8d5cfbd32c2 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -1104,7 +1104,7 @@ xpc_do_exit(enum xp_retval reason) if (is_shub()) xpc_exit_sn2(); - else + else if (is_uv()) xpc_exit_uv(); } @@ -1363,7 +1363,7 @@ out_2: out_1: if (is_shub()) xpc_exit_sn2(); - else + else if (is_uv()) xpc_exit_uv(); return ret; } |