[Oracleasm-commits] mkp commits r404 - trunk/include/linux/oracleasm

[svn-commits at oss.oracle.com]

Author: mkp
Date: 2009-01-07 13:34:35 -0800 (Wed, 07 Jan 2009)
New Revision: 404

Modified:
   trunk/include/linux/oracleasm/compat32.h
Log:

ioctl32.h doesn't exist post 2.6.22.  Make inclusion kernel version dependent.



Modified: trunk/include/linux/oracleasm/compat32.h
===================================================================
--- trunk/include/linux/oracleasm/compat32.h	2008-12-16 17:41:40 UTC (rev 403)
+++ trunk/include/linux/oracleasm/compat32.h	2009-01-07 21:34:35 UTC (rev 404)
@@ -70,6 +70,8 @@
 #ifndef _ORACLEASM_COMPAT32_H
 #define _ORACLEASM_COMPAT32_H
 
+#include <linux/version.h>
+
 /*
  * This is ugly.  SIZEOF_UNSIGNED_LONG comes from autoconf.
  * Do you have a better way?  I chose not to hand-cook an autoconf
@@ -93,7 +95,7 @@
 #define HIGH_UB4(_ub8)          ((unsigned long)(((_ub8) >> 32) & 0xFFFFFFFFULL))
 #define LOW_UB4(_ub8)           ((unsigned long)((_ub8) & 0xFFFFFFFFULL))
 
-#if defined(CONFIG_COMPAT)
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 # include <linux/ioctl32.h>
 #endif