Module Name:    src
Committed By:   riastradh
Date:           Wed Jul 24 02:02:03 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/include/asm [riastradh-drm2]: uaccess.h
        src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: uaccess.h

Log Message:
Define copy_{to,from}_user in <linux/uaccess.h> & <asm/uaccess.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
    src/sys/external/bsd/drm2/include/asm/uaccess.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
    src/sys/external/bsd/drm2/include/linux/uaccess.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/include/asm/uaccess.h
diff -u src/sys/external/bsd/drm2/include/asm/uaccess.h:1.1.2.1 src/sys/external/bsd/drm2/include/asm/uaccess.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/asm/uaccess.h:1.1.2.1	Wed Jul 24 00:33:11 2013
+++ src/sys/external/bsd/drm2/include/asm/uaccess.h	Wed Jul 24 02:02:03 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaccess.h,v 1.1.2.1 2013/07/24 00:33:11 riastradh Exp $	*/
+/*	$NetBSD: uaccess.h,v 1.1.2.2 2013/07/24 02:02:03 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,4 +32,20 @@
 #ifndef _ASM_UACCESS_H_
 #define _ASM_UACCESS_H_
 
+#include <sys/types.h>
+#include <sys/systm.h>
+
+static inline int
+copy_from_user(void *kernel_addr, const void *user_addr, size_t len)
+{
+	return -copyin(user_addr, kernel_addr, len);
+}
+
+static inline int
+copy_to_user(void *user_addr, const void *kernel_addr, size_t len)
+{
+	return -copyout(kernel_addr, user_addr, len);
+}
+
+
 #endif  /* _ASM_UACCESS_H_ */

Index: src/sys/external/bsd/drm2/include/linux/uaccess.h
diff -u src/sys/external/bsd/drm2/include/linux/uaccess.h:1.1.2.1 src/sys/external/bsd/drm2/include/linux/uaccess.h:1.1.2.2
--- src/sys/external/bsd/drm2/include/linux/uaccess.h:1.1.2.1	Wed Jul 24 00:33:12 2013
+++ src/sys/external/bsd/drm2/include/linux/uaccess.h	Wed Jul 24 02:02:03 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaccess.h,v 1.1.2.1 2013/07/24 00:33:12 riastradh Exp $	*/
+/*	$NetBSD: uaccess.h,v 1.1.2.2 2013/07/24 02:02:03 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,4 +32,6 @@
 #ifndef _LINUX_UACCESS_H_
 #define _LINUX_UACCESS_H_
 
+#include <asm/uaccess.h>
+
 #endif  /* _LINUX_UACCESS_H_ */

Reply via email to