From e1cdf7d06c2ad4de99f4b0114fbaf2040fa731aa Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Thu, 8 Sep 2005 10:46:58 -0500 Subject: [PATCH] --- yaml --- r: 8011 b: refs/heads/master c: 408865ce4829376120489ac8011b72125453dcff h: refs/heads/master i: 8009: f0ea7783b5203edf5cd0fda9847463e908520521 8007: 8e0f5d31bb91e533cb076e9747c8cf6574d2fb7b v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/xpc_main.c | 4 ++++ trunk/arch/ia64/sn/kernel/xpnet.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9be92c594d9e..f4ec703fe8a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 087f902686beb6c02157c271e3fc95606dbdfdbf +refs/heads/master: 408865ce4829376120489ac8011b72125453dcff diff --git a/trunk/arch/ia64/sn/kernel/xpc_main.c b/trunk/arch/ia64/sn/kernel/xpc_main.c index bb1d5cf30440..ed7c21586e98 100644 --- a/trunk/arch/ia64/sn/kernel/xpc_main.c +++ b/trunk/arch/ia64/sn/kernel/xpc_main.c @@ -885,6 +885,10 @@ xpc_init(void) pid_t pid; + if (!ia64_platform_is("sn2")) { + return -ENODEV; + } + /* * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng * both a partition's reserved page and its XPC variables. Its size was diff --git a/trunk/arch/ia64/sn/kernel/xpnet.c b/trunk/arch/ia64/sn/kernel/xpnet.c index 78c13d676fa6..d0c2c114a459 100644 --- a/trunk/arch/ia64/sn/kernel/xpnet.c +++ b/trunk/arch/ia64/sn/kernel/xpnet.c @@ -636,6 +636,10 @@ xpnet_init(void) int result = -ENOMEM; + if (!ia64_platform_is("sn2")) { + return -ENODEV; + } + dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME); /*