From 7ed8d648565272cc662b5507382cec6a95921cfb Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 18 May 2008 20:47:07 +0200
Subject: [PATCH] --- yaml --- r: 96859 b: refs/heads/master c:
 70f9cac5e077df8fc5a613d84e2e13005a6ff841 h: refs/heads/master i:   96857:
 fb8503f6c027e7118b66c7ff3e5930bca2a13cc9   96855:
 9f60f58117ee8ec6a08d9e7ec5c9a7b9e6eee4f9 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-m68k/uaccess.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92b30c3cb0f0..9243fb8ed020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29e92f483603d97dd1d2bafcb32101287dfac4ad
+refs/heads/master: 70f9cac5e077df8fc5a613d84e2e13005a6ff841
diff --git a/trunk/include/asm-m68k/uaccess.h b/trunk/include/asm-m68k/uaccess.h
index 5c1264cf0c65..7107f3fbdbb6 100644
--- a/trunk/include/asm-m68k/uaccess.h
+++ b/trunk/include/asm-m68k/uaccess.h
@@ -14,7 +14,11 @@
 #define VERIFY_WRITE	1
 
 /* We let the MMU do all checking */
-#define access_ok(type,addr,size) 1
+static inline int access_ok(int type, const void __user *addr,
+			    unsigned long size)
+{
+	return 1;
+}
 
 /*
  * The exception table consists of pairs of addresses: the first is the