diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /drivers/input/evdev.c | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index a92d81567559..3524bef62be6 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -677,8 +677,8 @@ static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user | |||
| 677 | len = OLD_KEY_MAX; | 677 | len = OLD_KEY_MAX; |
| 678 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) | 678 | if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000)) |
| 679 | printk(KERN_WARNING | 679 | printk(KERN_WARNING |
| 680 | "evdev.c(EVIOCGBIT): Suspicious buffer size %d, " | 680 | "evdev.c(EVIOCGBIT): Suspicious buffer size %u, " |
| 681 | "limiting output to %d bytes. See " | 681 | "limiting output to %zu bytes. See " |
| 682 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", | 682 | "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n", |
| 683 | OLD_KEY_MAX, | 683 | OLD_KEY_MAX, |
| 684 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); | 684 | BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long)); |