The patch titled sgi-xp/sgi-gru: allow modules to load on non-uv systems has been added to the -mm tree. Its filename is sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sgi-xp/sgi-gru: allow modules to load on non-uv systems From: Robin Holt <holt@xxxxxxx> 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: Robin Holt <holt@xxxxxxx> Signed-off-by: Jack Steiner <steiner@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-gru/grufile.c | 2 +- drivers/misc/sgi-xp/xp_main.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/misc/sgi-gru/grufile.c~sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems drivers/misc/sgi-gru/grufile.c --- a/drivers/misc/sgi-gru/grufile.c~sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems +++ a/drivers/misc/sgi-gru/grufile.c @@ -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 */ diff -puN drivers/misc/sgi-xp/xp_main.c~sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems drivers/misc/sgi-xp/xp_main.c --- a/drivers/misc/sgi-xp/xp_main.c~sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems +++ a/drivers/misc/sgi-xp/xp_main.c @@ -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; } _ Patches currently in -mm which might be from holt@xxxxxxx are sgi-xp-sgi-gru-allow-modules-to-load-on-non-uv-systems.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html