---

yaml --- r: 55 b: refs/heads/master c: e63f8f4 h: refs/heads/master i: 53: 05bbdac 51: ee5177d 47: d741651 v: v3
git-mirror · Apr 16, 2005 · 48301e3 · 48301e3
1 parent d4d35e0
commit 48301e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89e09f5ebba4bcde9852e4be4af536d5b691f20a
+refs/heads/master: e63f8f439de010b6227c0c9c6f56e2c44dbe5dae
diff --git a/trunk/include/asm-ppc64/processor.h b/trunk/include/asm-ppc64/processor.h
@@ -642,11 +642,17 @@ static inline unsigned long __pack_fe01(unsigned int fpmode)
 
 static inline void prefetch(const void *x)
 {
+	if (unlikely(!x))
+		return;
+
 	__asm__ __volatile__ ("dcbt 0,%0" : : "r" (x));
 }
 
 static inline void prefetchw(const void *x)
 {
+	if (unlikely(!x))
+		return;
+
 	__asm__ __volatile__ ("dcbtst 0,%0" : : "r" (x));
 }