CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Sep  8 15:54:48 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_cache.c

Log Message:
Helps to commit all my changes to drm_cache.c.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/external/bsd/drm2/drm/drm_cache.c

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/drm/drm_cache.c
diff -u src/sys/external/bsd/drm2/drm/drm_cache.c:1.1.2.1 src/sys/external/bsd/drm2/drm/drm_cache.c:1.1.2.2
--- src/sys/external/bsd/drm2/drm/drm_cache.c:1.1.2.1	Sun Sep  8 15:41:07 2013
+++ src/sys/external/bsd/drm2/drm/drm_cache.c	Sun Sep  8 15:54:48 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_cache.c,v 1.1.2.1 2013/09/08 15:41:07 riastradh Exp $	*/
+/*	$NetBSD: drm_cache.c,v 1.1.2.2 2013/09/08 15:54:48 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.1.2.1 2013/09/08 15:41:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.1.2.2 2013/09/08 15:54:48 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/xcall.h>
@@ -94,13 +94,13 @@ drm_md_clflush_finegrained_p(void)
 static void
 drm_x86_clflush_cpu(void)
 {
-	__asm__ __volatile__ ("wbinvd");
+	asm volatile ("wbinvd");
 }
 
 static void
 drm_x86_clflush(const void *vaddr)
 {
-	__asm__ __volatile__ ("clflush %0" : : "=r" (vaddr));
+	asm volatile ("clflush %0" : : "m" (*(const char *)vaddr));
 }
 
 static size_t
@@ -119,7 +119,7 @@ drm_x86_clflush_xc(void *arg0 __unused, 
 static void
 drm_md_clflush_all(void)
 {
-	xc_wait(xc_broadcast(0, &drm_md_clflush_xc, NULL, NULL));
+	xc_wait(xc_broadcast(0, &drm_x86_clflush_xc, NULL, NULL));
 }
 
 static void
@@ -142,7 +142,7 @@ drm_md_clflush_virt_range(const void *va
 
 	KASSERT(drm_md_clflush_finegrained_p());
 	for (p = start; p < end; p += clflush_size)
-		drm_clflush(p);
+		drm_x86_clflush(p);
 }
 
 #endif	/* defined(__i386__) || defined(__x86_64__) */