merge with 4.0.1dX_4_0_1e-20001107-mergeX_4_0_1d-20001107-merge

1 files changed, 9 insertions, 0 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 6be90c51..46e08e05 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -59,6 +59,15 @@
 #include <asm/io.h>
 #include <asm/mman.h>
 #include <asm/uaccess.h>
+
+#ifndef copy_to_user_ret
+#define copy_to_user_ret(to,from,n,retval) ({ if (copy_to_user(to,from,n)) return retval; })
+#endif
+
+#ifndef copy_from_user_ret
+#define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n)) return retval; })
+#endif
+
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif