diff options
author | Dean Nelson <dcn@sgi.com> | 2005-09-08 11:46:58 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 16:53:09 -0400 |
commit | 408865ce4829376120489ac8011b72125453dcff (patch) | |
tree | 090ab8cabba6f08ac2b2487cc9210bf39c6a99ad | |
parent | 087f902686beb6c02157c271e3fc95606dbdfdbf (diff) |
[IA64] ensure XPC and XPNET are loaded on sn2 platforms only
These are SN2 only drivers. They should have platform checks to prevent
them from doing evil stuff in GENERIC kernels.
Signed-off-by: Martin Hicks <mort@sgi.com>
Acked-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/sn/kernel/xpc_main.c | 4 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/xpnet.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c index bb1d5cf30440..ed7c21586e98 100644 --- a/arch/ia64/sn/kernel/xpc_main.c +++ b/arch/ia64/sn/kernel/xpc_main.c | |||
@@ -885,6 +885,10 @@ xpc_init(void) | |||
885 | pid_t pid; | 885 | pid_t pid; |
886 | 886 | ||
887 | 887 | ||
888 | if (!ia64_platform_is("sn2")) { | ||
889 | return -ENODEV; | ||
890 | } | ||
891 | |||
888 | /* | 892 | /* |
889 | * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng | 893 | * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng |
890 | * both a partition's reserved page and its XPC variables. Its size was | 894 | * both a partition's reserved page and its XPC variables. Its size was |
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c index 78c13d676fa6..d0c2c114a459 100644 --- a/arch/ia64/sn/kernel/xpnet.c +++ b/arch/ia64/sn/kernel/xpnet.c | |||
@@ -636,6 +636,10 @@ xpnet_init(void) | |||
636 | int result = -ENOMEM; | 636 | int result = -ENOMEM; |
637 | 637 | ||
638 | 638 | ||
639 | if (!ia64_platform_is("sn2")) { | ||
640 | return -ENODEV; | ||
641 | } | ||
642 | |||
639 | dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME); | 643 | dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME); |
640 | 644 | ||
641 | /* | 645 | /* |