git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
microcode.c
diff --git
a/arch/i386/kernel/microcode.c
b/arch/i386/kernel/microcode.c
index
553164f
..
07ddfdf
100644
(file)
--- a/
arch/i386/kernel/microcode.c
+++ b/
arch/i386/kernel/microcode.c
@@
-113,7
+113,7
@@
static spinlock_t microcode_update_lock = SPIN_LOCK_UNLOCKED;
/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
static DECLARE_MUTEX(microcode_sem);
/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
static DECLARE_MUTEX(microcode_sem);
-static void
*user_buffer;
/* user area microcode data buffer */
+static void
__user *user_buffer;
/* user area microcode data buffer */
static unsigned int user_buffer_size; /* it's size */
typedef enum mc_error_code {
static unsigned int user_buffer_size; /* it's size */
typedef enum mc_error_code {
@@
-363,7
+363,7
@@
static void do_update_one (void * unused)
struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
if (uci->mc == NULL) {
struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
if (uci->mc == NULL) {
- printk(KERN_INFO "microcode: No
suitable
data for cpu %d\n", cpu_num);
+ printk(KERN_INFO "microcode: No
new micro
data for cpu %d\n", cpu_num);
return;
}
return;
}
@@
-425,7
+425,7
@@
out:
return error;
}
return error;
}
-static ssize_t microcode_write (struct file *file, const char *buf, size_t len, loff_t *ppos)
+static ssize_t microcode_write (struct file *file, const char
__user
*buf, size_t len, loff_t *ppos)
{
ssize_t ret;
{
ssize_t ret;
@@
-441,7
+441,7
@@
static ssize_t microcode_write (struct file *file, const char *buf, size_t len,
down(µcode_sem);
down(µcode_sem);
- user_buffer = (void *) buf;
+ user_buffer = (void
__user
*) buf;
user_buffer_size = (int) len;
ret = do_microcode_update();
user_buffer_size = (int) len;
ret = do_microcode_update();