projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6'
[powerpc.git]
/
drivers
/
input
/
evdev.c
diff --git
a/drivers/input/evdev.c
b/drivers/input/evdev.c
index
1d62c8b
..
e5b4e9b
100644
(file)
--- a/
drivers/input/evdev.c
+++ b/
drivers/input/evdev.c
@@
-495,7
+495,7
@@
static unsigned int evdev_poll(struct file *file, poll_table *wait)
#ifdef CONFIG_COMPAT
#define BITS_PER_LONG_COMPAT (sizeof(compat_long_t) * 8)
#ifdef CONFIG_COMPAT
#define BITS_PER_LONG_COMPAT (sizeof(compat_long_t) * 8)
-#define
NBIT
S_COMPAT(x) ((((x) - 1) / BITS_PER_LONG_COMPAT) + 1)
+#define
BITS_TO_LONG
S_COMPAT(x) ((((x) - 1) / BITS_PER_LONG_COMPAT) + 1)
#ifdef __BIG_ENDIAN
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
#ifdef __BIG_ENDIAN
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
@@
-504,7
+504,7
@@
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
int len, i;
if (compat) {
int len, i;
if (compat) {
- len =
NBIT
S_COMPAT(maxbit) * sizeof(compat_long_t);
+ len =
BITS_TO_LONG
S_COMPAT(maxbit) * sizeof(compat_long_t);
if (len > maxlen)
len = maxlen;
if (len > maxlen)
len = maxlen;
@@
-515,7
+515,7
@@
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
sizeof(compat_long_t)))
return -EFAULT;
} else {
sizeof(compat_long_t)))
return -EFAULT;
} else {
- len =
NBIT
S(maxbit) * sizeof(long);
+ len =
BITS_TO_LONG
S(maxbit) * sizeof(long);
if (len > maxlen)
len = maxlen;
if (len > maxlen)
len = maxlen;
@@
-530,8
+530,8
@@
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
unsigned int maxlen, void __user *p, int compat)
{
int len = compat ?
unsigned int maxlen, void __user *p, int compat)
{
int len = compat ?
-
NBIT
S_COMPAT(maxbit) * sizeof(compat_long_t) :
-
NBIT
S(maxbit) * sizeof(long);
+
BITS_TO_LONG
S_COMPAT(maxbit) * sizeof(compat_long_t) :
+
BITS_TO_LONG
S(maxbit) * sizeof(long);
if (len > maxlen)
len = maxlen;
if (len > maxlen)
len = maxlen;
@@
-545,7
+545,7
@@
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
unsigned int maxlen, void __user *p, int compat)
{
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
unsigned int maxlen, void __user *p, int compat)
{
- int len =
NBIT
S(maxbit) * sizeof(long);
+ int len =
BITS_TO_LONG
S(maxbit) * sizeof(long);
if (len > maxlen)
len = maxlen;
if (len > maxlen)
len = maxlen;