r8503: Fix IA64 build problems reported by John Partridge <johnip@sgi.com>

Signed-off-by: James Lentini <jlentini@netapp.com>

diff --git a/Makefile.am b/Makefile.am
index 405dca27aca75fe9efb2d61f64a8cc1753f7c94d..62db9dd383d11f7705d39894e445d020f7900734 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
 # $Id: $
 
+OSFLAGS = -DOS_RELEASE=$(shell expr `uname -r | cut -f1 -d.` \* 65536 + `uname -r | cut -f2 -d.`)
 # Check for RedHat, needed for ia64 udapl atomic operations (IA64_FETCHADD syntax)
 if OS_RHEL
-OSFLAGS=-DREDHAT_EL4
+OSFLAGS += -DREDHAT_EL4
 else
-OSFLAGS=
+OSFLAGS +=
 endif
 
 if DEBUG

diff --git a/dapl/udapl/linux/dapl_osd.h b/dapl/udapl/linux/dapl_osd.h
index 822686a8fb4f12e5d6dee749bea3b32787c7decd..fb2db09f8bafd26d31cd02c9b58c55ac97da406b 100644 (file)
--- a/dapl/udapl/linux/dapl_osd.h
+++ b/dapl/udapl/linux/dapl_osd.h
@@ -80,6 +80,8 @@
 
 #if defined(__ia64__) || defined(__PPC64__)
 #include <asm/atomic.h>
+#endif
+#if defined(__PPC64__)
 #include <asm/system.h>
 #endif