From 898ba72569af265edf27e0f69c09220c80f33f38 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 28 Oct 2006 10:38:46 -0700
Subject: [PATCH] --- yaml --- r: 40407 b: refs/heads/master c:
 5fa3839a64203b2ab727dcb37da9b2d7079fca28 h: refs/heads/master i:   40405:
 5a20869947bc964d70b38b470868a87e9dddc8ca   40403:
 cb958b13ed6f445c601524a0e224457b4a1352c5   40399:
 747620ed6c6eeb26a1ad8f84f29e1ce1484766cc v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/compat.h | 2 +-
 trunk/kernel/compat.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 37de77195231..e73f72f2f5fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87135762de4328c6f17897e803e6909bc056feb
+refs/heads/master: 5fa3839a64203b2ab727dcb37da9b2d7079fca28
diff --git a/trunk/include/linux/compat.h b/trunk/include/linux/compat.h
index f4ebf96f5308..f1553196826f 100644
--- a/trunk/include/linux/compat.h
+++ b/trunk/include/linux/compat.h
@@ -196,7 +196,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
 #define BITS_TO_COMPAT_LONGS(bits) \
 	(((bits)+BITS_PER_COMPAT_LONG-1)/BITS_PER_COMPAT_LONG)
 
-long compat_get_bitmap(unsigned long *mask, compat_ulong_t __user *umask,
+long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
 		       unsigned long bitmap_size);
 long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
 		       unsigned long bitmap_size);
diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c
index 75573e5d27b0..d4898aad6cfa 100644
--- a/trunk/kernel/compat.c
+++ b/trunk/kernel/compat.c
@@ -678,7 +678,7 @@ int get_compat_sigevent(struct sigevent *event,
 		? -EFAULT : 0;
 }
 
-long compat_get_bitmap(unsigned long *mask, compat_ulong_t __user *umask,
+long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
 		       unsigned long bitmap_size)
 {
 	int i, j;