1 From: Dean Nelson <dcn@sgi.com>
2 Subject: SGI SN: Eliminate dependency of the XP/XPC drivers on GRU.
6 For the time being build for ia64-sn2 alone when CONFIG_IA64_GENERIC is
9 Signed-off-by: Dean Nelson <dcn@sgi.com>
10 Acked-by: Raymund Will <rw@suse.de>
14 drivers/misc/sgi-xp/Makefile | 4 ++--
15 drivers/misc/sgi-xp/xp.h | 4 ++++
16 drivers/misc/sgi-xp/xpc_main.c | 4 ++--
17 3 files changed, 8 insertions(+), 4 deletions(-)
19 Index: linux/drivers/misc/sgi-xp/Makefile
20 ===================================================================
21 --- linux.orig/drivers/misc/sgi-xp/Makefile 2008-10-23 10:59:42.000000000 -0500
22 +++ linux/drivers/misc/sgi-xp/Makefile 2008-10-23 10:59:44.000000000 -0500
24 obj-$(CONFIG_SGI_XP) += xp.o
26 xp-$(CONFIG_IA64_SGI_SN2) += xp_sn2.o xp_nofault.o
27 -xp-$(CONFIG_IA64_GENERIC) += xp_sn2.o xp_nofault.o xp_uv.o
28 +xp-$(CONFIG_IA64_GENERIC) += xp_sn2.o xp_nofault.o
29 xp-$(CONFIG_IA64_SGI_UV) += xp_uv.o
30 xp-$(CONFIG_X86_64) += xp_uv.o
32 obj-$(CONFIG_SGI_XP) += xpc.o
33 xpc-y := xpc_main.o xpc_channel.o xpc_partition.o
34 xpc-$(CONFIG_IA64_SGI_SN2) += xpc_sn2.o
35 -xpc-$(CONFIG_IA64_GENERIC) += xpc_sn2.o xpc_uv.o
36 +xpc-$(CONFIG_IA64_GENERIC) += xpc_sn2.o
37 xpc-$(CONFIG_IA64_SGI_UV) += xpc_uv.o
38 xpc-$(CONFIG_X86_64) += xpc_uv.o
40 Index: linux/drivers/misc/sgi-xp/xp.h
41 ===================================================================
42 --- linux.orig/drivers/misc/sgi-xp/xp.h 2008-10-23 10:59:42.000000000 -0500
43 +++ linux/drivers/misc/sgi-xp/xp.h 2008-10-23 10:59:44.000000000 -0500
45 #include <asm/system.h>
46 #include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */
47 #define is_shub() ia64_platform_is("sn2")
48 +#ifdef CONFIG_IA64_SGI_UV
49 #define is_uv() ia64_platform_is("uv")
55 #include <asm/genapic.h>
56 Index: linux/drivers/misc/sgi-xp/xpc_main.c
57 ===================================================================
58 --- linux.orig/drivers/misc/sgi-xp/xpc_main.c 2008-10-23 10:59:42.000000000 -0500
59 +++ linux/drivers/misc/sgi-xp/xpc_main.c 2008-10-23 10:59:44.000000000 -0500
60 @@ -1104,7 +1104,7 @@ xpc_do_exit(enum xp_retval reason)
69 @@ -1363,7 +1363,7 @@ out_2: