Commit 5a943617 authored Oct 08, 2009 by John Kacur Committed by H. Peter Anvin Oct 08, 2009

x86, cpuid: Simplify the code in cpuid_open



Peter picked up my patch for tip/x86/cpu that removes the bkl in
cpuid_open. Ingo subsequently merged that into tip/master.

This patch folds back in tglx's 55968ede164ae523692f00717f50cd926f1382a0
to my patch that removed the bkl.

This simplifies the code, and makes it consistent with the changes to
kill the bkl in msr.c as well.

Originally-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Kacur <jkacur@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 170a0bc3

arch/x86/kernel/cpuid.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -116,18 +116,16 @@ static int cpuid_open(struct inode inode, struct file file)
		{
		unsigned int cpu;
		struct cpuinfo_x86 *c;
		int ret = 0;

		cpu = iminor(file->f_path.dentry->d_inode);
		if (cpu >= nr_cpu_ids \|\| !cpu_online(cpu)) {
		ret = -ENXIO; /* No such CPU */
		goto out;
		}
		if (cpu >= nr_cpu_ids \|\| !cpu_online(cpu))
		return -ENXIO; /* No such CPU */

		c = &cpu_data(cpu);
		if (c->cpuid_level < 0)
		ret = -EIO; /* CPUID not supported */
		out:
		return ret;
		return -EIO; /* CPUID not supported */

		return 0;
		}

		/*

Admin message