From: Dean Nelson <dcn@sgi.com>
Date: Wed, 30 Jul 2008 05:34:02 +0000 (-0700)
Subject: sgi-xp: define is_shub() and is_uv() macros
X-Git-Tag: v2.6.27-rc2~147
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=355c54d2e70093f09910d2ecf343023aefc219e1;p=linux-2.6-omap-h63xx.git

sgi-xp: define is_shub() and is_uv() macros

Define the is_shub()/is_uv() macros if they've not already been defined.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 03a87a307e3..83627eac412 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/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