---

yaml --- r: 109299 b: refs/heads/master c: 4b46ca7 h: refs/heads/master i: 109297: 78d2374 109295: f5b2094 v: v3
git-mirror · Aug 26, 2008 · a274382 · a274382
1 parent 85e97b1
commit a274382
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6f31932d0a1d2b13952f506ebc92675e2d8df80
+refs/heads/master: 4b46ca701bdcdc19fcf32823f9fcabf8236e4e78
diff --git a/trunk/arch/x86/kernel/cpuid.c b/trunk/arch/x86/kernel/cpuid.c
@@ -89,14 +89,17 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
 	struct cpuid_regs cmd;
 	int cpu = iminor(file->f_path.dentry->d_inode);
 	u64 pos = *ppos;
+	int err;
 
 	if (count % 16)
 		return -EINVAL;	/* Invalid chunk size */
 
 	for (; count; count -= 16) {
 		cmd.eax = pos;
 		cmd.ecx = pos >> 32;
-		smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);
+		err = smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1);
+		if (err)
+			return err;
 		if (copy_to_user(tmp, &cmd, 16))
 			return -EFAULT;
 		tmp += 16;