The patch titled sgi-xp: define is_shub() and is_uv() macros has been added to the -mm tree. Its filename is sgi-xp-define-is_shub-and-is_uv-macros.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://www.zip.com.au/~akpm/linux/patches/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: define is_shub() and is_uv() macros From: Dean Nelson <dcn@xxxxxxx> Define the is_shub()/is_uv() macros if they've not already been defined. Signed-off-by: Dean Nelson <dcn@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-xp/xp.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff -puN drivers/misc/sgi-xp/xp.h~sgi-xp-define-is_shub-and-is_uv-macros drivers/misc/sgi-xp/xp.h --- a/drivers/misc/sgi-xp/xp.h~sgi-xp-define-is_shub-and-is_uv-macros +++ a/drivers/misc/sgi-xp/xp.h @@ -25,6 +25,22 @@ #define DBUG_ON(condition) #endif +#ifndef is_shub1 +#define is_shub1() 0 +#endif + +#ifndef is_shub2 +#define is_shub2() 0 +#endif + +#ifndef is_shub +#define is_shub() (is_shub1() || is_shub2()) +#endif + +#ifndef is_uv +#define is_uv() 0 +#endif + /* * Define the maximum number of logically defined partitions the system * can support. It is constrained by the maximum number of hardware _ Patches currently in -mm which might be from dcn@xxxxxxx are sgi-xp-define-is_shub-and-is_uv-macros.patch sgi-xp-define-xpsalerror-reason-code.patch sgi-xp-define-bytes_per_word.patch sgi-xp-support-runtime-selection-of-xp_max_npartitions.patch sgi-xp-create-a-common-xp_remote_memcpy-function.patch sgi-xp-prepare-xpc_rsvd_page-to-work-on-either-sn2-or-uv-hardware.patch sgi-xp-isolate-xpc_vars_part-structure-to-sn2-only.patch sgi-xp-isolate-xpc_vars-structure-to-sn2-only.patch sgi-xp-base-xpc_rsvd_pages-timestamp-on-jiffies.patch sgi-xp-move-xpc_allocate-into-xpc_send-xpc_send_notify.patch sgi-xp-isolate-activate-irqs-hardware-specific-components.patch sgi-xp-isolate-additional-sn2-specific-code.patch sgi-xp-separate-chctl_flags-from-xpcs-notify-irq.patch sgi-xp-replace-amo_t-typedef-by-struct-amo.patch sgi-xp-isolate-allocation-of-xpcs-msgqueues-to-sn2-only.patch sgi-xp-enable-xpnet-to-handle-more-than-64-partitions.patch sgi-xp-isolate-remote-copy-buffer-to-sn2-only.patch sgi-xp-add-_sn2-suffix-to-a-few-variables.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