Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758418AbZJHPVF (ORCPT ); Thu, 8 Oct 2009 11:21:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758347AbZJHPVE (ORCPT ); Thu, 8 Oct 2009 11:21:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3529 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891AbZJHPVC (ORCPT ); Thu, 8 Oct 2009 11:21:02 -0400 Date: Thu, 8 Oct 2009 17:20:15 +0200 (CEST) From: John Kacur X-X-Sender: jkacur@localhost.localdomain To: hpa@zytor.com, linux-kernel@vger.kernel.org, Thomas Gleixner cc: linux-rt-users@vger.kernel.org, Clark Williams , Ingo Molnar , Frederic Weisbecker , Sven-Thorsten Dietrich Subject: Simplify the code in cpuid_open Message-ID: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1863 Lines: 63 Peter picked up my patch for tip/x86/cpu that removes the bkl in cpuid_open. Ingo subsequently merged that into tip/master. The following patch folds back-in tglx's patch that we should have known about if we had looked into tip/rt/bkl in the first place! Please pick it up for tip/x86/cpu and tip/master. >From b416b75555aca5e7f066f6edd824fce4b7d08d28 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Thu, 8 Oct 2009 16:31:57 +0200 Subject: [PATCH] Simplify the code in cpuid_open 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. This is applied against tip/master Signed-off-by: John Kacur --- arch/x86/kernel/cpuid.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 8bb8401..7ef24a7 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c @@ -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; } /* -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/