From 64b11e43a2a7094447ea29b1cd4731e7ed93dfcc Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Thu, 7 Dec 2006 02:14:13 +0100 Subject: [PATCH] --- yaml --- r: 43137 b: refs/heads/master c: f475ff352c5e05d473c462b97c3a13a5b803af5a h: refs/heads/master i: 43135: 368ef0d6ed0ec46d41230654a14d058e9a5f4e5e v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/msr.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df29f3af8eb6..79bed1be5988 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dc452ba2d47f376987a99c0819833af0b46cc3f +refs/heads/master: f475ff352c5e05d473c462b97c3a13a5b803af5a diff --git a/trunk/arch/i386/kernel/msr.c b/trunk/arch/i386/kernel/msr.c index a773f776c9ea..fd45059c9084 100644 --- a/trunk/arch/i386/kernel/msr.c +++ b/trunk/arch/i386/kernel/msr.c @@ -195,7 +195,6 @@ static ssize_t msr_write(struct file *file, const char __user *buf, { const u32 __user *tmp = (const u32 __user *)buf; u32 data[2]; - size_t rv; u32 reg = *ppos; int cpu = iminor(file->f_dentry->d_inode); int err; @@ -203,7 +202,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, if (count % 8) return -EINVAL; /* Invalid chunk size */ - for (rv = 0; count; count -= 8) { + for (; count; count -= 8) { if (copy_from_user(&data, tmp, 8)) return -EFAULT; err = do_wrmsr(cpu, reg, data[0], data[1]);