Changeset 22 for lm-sensors/trunk/kernel/compat.h

Timestamp:

12/02/98 18:25:53 (14 years ago)

Author:

frodo

Message:

Fixes to make code compile with 2.1 kernels

Everything now compiles cleanly (except for warnings in kernel header files)
against 2.1.122. As I do not run 2.1 kernels, loading them could not be
tested.

Files:

• lm-sensors/trunk/kernel/compat.h (modified) (1 diff)

lm-sensors/trunk/kernel/compat.h

@@ -38 +38 @@
 #endif /* def MODULE */
 
-/* copy_from/to_usr is called memcpy_from/to_fs in 2.0 kernels; perhaps in
-   some early 2.1 kernels too? */
+/* copy_from/to_usr is called memcpy_from/to_fs in 2.0 kernels 
+   get_user was redefined in 2.1 kernels to use two arguments, and returns
+   an error code */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,4))
 #define copy_from_user memcpy_fromfs
 #define copy_to_user memcpy_tofs
-#endif
-
-/* get_user was redefined in 2.1 kernels to use two arguments, and returns
-   an error code */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,1,4))
 #define get_user_data(to,from) ((to) = get_user(from),0)
 #else
+#include <asm/uaccess.h>
 #define get_user_data(to,from) get_user(to,from)
 #endif