Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7f7b074 authored by Dean Nelson's avatar Dean Nelson Committed by Linus Torvalds
Browse files

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: default avatarDean Nelson <dcn@sgi.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d25141a8

drivers/misc/sgi-xp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 
obj-$(CONFIG_SGI_XP)		+= xp.o

xp-y				:= xp_main.o

xp-$(CONFIG_IA64_SGI_SN2)	+= xp_sn2.o xp_nofault.o

xp-$(CONFIG_IA64_GENERIC)	+= xp_sn2.o xp_nofault.o xp_uv.o

xp-$(CONFIG_IA64_GENERIC)	+= xp_sn2.o xp_nofault.o

xp-$(CONFIG_IA64_SGI_UV)	+= xp_uv.o

xp-$(CONFIG_X86_64)		+= xp_uv.o



obj-$(CONFIG_SGI_XP)		+= xpc.o

xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o

xpc-$(CONFIG_IA64_SGI_SN2)	+= xpc_sn2.o

xpc-$(CONFIG_IA64_GENERIC)	+= xpc_sn2.o xpc_uv.o

xpc-$(CONFIG_IA64_GENERIC)	+= xpc_sn2.o

xpc-$(CONFIG_IA64_SGI_UV) 	+= xpc_uv.o

xpc-$(CONFIG_X86_64)		+= xpc_uv.o

drivers/misc/sgi-xp/xp.h

+4 −0
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ 
#include <asm/system.h>

#include <asm/sn/arch.h>	/* defines is_shub1() and is_shub2() */

#define is_shub()	ia64_platform_is("sn2")

#ifdef CONFIG_IA64_SGI_UV

#define is_uv()		ia64_platform_is("uv")

#else

#define is_uv()		0

#endif

#endif

#ifdef CONFIG_X86_64

#include <asm/genapic.h>

drivers/misc/sgi-xp/xpc_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}