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

Commit e873cff0 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

sgi-xp/sgi-gru: allow modules to load on non-uv systems 



For an upcoming distro release, we need to have the xp kernel module
loadable even when not on UV equipment.  The xpc module will not load.
This will allow one set of modules dependent upon xp to work on either UV
or non-UV equipment.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d7197f4

drivers/misc/sgi-gru/grufile.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int __init gru_init(void) 
	void *gru_start_vaddr;



	if (!is_uv_system())

		return -ENODEV;

		return 0;



#if defined CONFIG_IA64

	gru_start_paddr = 0xd000000000UL; /* ZZZZZZZZZZZZZZZZZZZ fixme */

drivers/misc/sgi-xp/xp_main.c

+6 −6
Original line number Diff line number Diff line
@@ -248,19 +248,19 @@ xp_init(void) 
	enum xp_retval ret;

	int ch_number;



	/* initialize the connection registration mutex */

	for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)

		mutex_init(&xpc_registrations[ch_number].mutex);



	if (is_shub())

		ret = xp_init_sn2();

	else if (is_uv())

		ret = xp_init_uv();

	else

		ret = xpUnsupported;

		ret = 0;



	if (ret != xpSuccess)

		return -ENODEV;



	/* initialize the connection registration mutex */

	for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)

		mutex_init(&xpc_registrations[ch_number].mutex);

		return ret;



	return 0;

}