diff options
author | Dean Nelson <dcn@sgi.com> | 2008-07-30 01:34:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-30 12:41:50 -0400 |
commit | 261f3b4979db88d29fc86aad9f76fbc0c2c6d21a (patch) | |
tree | 1cd1012b3ab52747a12e47f630b864d27af0bdf5 /drivers/misc/sgi-xp/xp_main.c | |
parent | 81fe7883d2c8a80a7145ad22f8cd8514d05412b9 (diff) |
sgi-xp: enable building of XPC/XPNET on x86_64
Get XPC/XPNET to build on x86_64. Trying to modprobe them up on a non-UV
or sn2 system will result in a -ENODEV.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Cc: Jack Steiner <steiner@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/xp_main.c')
-rw-r--r-- | drivers/misc/sgi-xp/xp_main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c index 9c0ce2f15ff6..c34b23fe498f 100644 --- a/drivers/misc/sgi-xp/xp_main.c +++ b/drivers/misc/sgi-xp/xp_main.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
19 | #include <linux/device.h> | 18 | #include <linux/device.h> |
20 | #include "xp.h" | 19 | #include "xp.h" |
@@ -36,9 +35,18 @@ struct device *xp = &xp_dbg_subname; | |||
36 | short xp_max_npartitions; | 35 | short xp_max_npartitions; |
37 | EXPORT_SYMBOL_GPL(xp_max_npartitions); | 36 | EXPORT_SYMBOL_GPL(xp_max_npartitions); |
38 | 37 | ||
38 | short xp_partition_id; | ||
39 | EXPORT_SYMBOL_GPL(xp_partition_id); | ||
40 | |||
41 | u8 xp_region_size; | ||
42 | EXPORT_SYMBOL_GPL(xp_region_size); | ||
43 | |||
39 | enum xp_retval (*xp_remote_memcpy) (void *dst, const void *src, size_t len); | 44 | enum xp_retval (*xp_remote_memcpy) (void *dst, const void *src, size_t len); |
40 | EXPORT_SYMBOL_GPL(xp_remote_memcpy); | 45 | EXPORT_SYMBOL_GPL(xp_remote_memcpy); |
41 | 46 | ||
47 | int (*xp_cpu_to_nasid) (int cpuid); | ||
48 | EXPORT_SYMBOL_GPL(xp_cpu_to_nasid); | ||
49 | |||
42 | /* | 50 | /* |
43 | * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level | 51 | * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level |
44 | * users of XPC. | 52 | * users of XPC. |