Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030206AbVINPyx (ORCPT ); Wed, 14 Sep 2005 11:54:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030213AbVINPyx (ORCPT ); Wed, 14 Sep 2005 11:54:53 -0400 Received: from mtagate2.de.ibm.com ([195.212.29.151]:36346 "EHLO mtagate2.de.ibm.com") by vger.kernel.org with ESMTP id S1030212AbVINPyv (ORCPT ); Wed, 14 Sep 2005 11:54:51 -0400 Date: Wed, 14 Sep 2005 17:54:52 +0200 From: Martin Schwidefsky To: akpm@osdl.org, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org Subject: [patch 5/7] s390: show_cpuinfo fix. Message-ID: <20050914155452.GD11478@skybase.boeblingen.de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.10i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1313 Lines: 38 [patch 5/7] s390: show_cpuinfo fix. From: Heiko Carstens Disable preemption in show_cpuinfo to avoid problems and the warning about smp_processor_id. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky diffstat: arch/s390/kernel/setup.c | 2 ++ 1 files changed, 2 insertions(+) diff -urpN linux-2.6/arch/s390/kernel/setup.c linux-2.6-patched/arch/s390/kernel/setup.c --- linux-2.6/arch/s390/kernel/setup.c 2005-08-29 01:41:01.000000000 +0200 +++ linux-2.6-patched/arch/s390/kernel/setup.c 2005-09-14 16:48:17.000000000 +0200 @@ -634,6 +634,7 @@ static int show_cpuinfo(struct seq_file struct cpuinfo_S390 *cpuinfo; unsigned long n = (unsigned long) v - 1; + preempt_disable(); if (!n) { seq_printf(m, "vendor_id : IBM/S390\n" "# processors : %i\n" @@ -658,6 +659,7 @@ static int show_cpuinfo(struct seq_file cpuinfo->cpu_id.ident, cpuinfo->cpu_id.machine); } + preempt_enable(); return 0; } - 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/