From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1JMQo8-0002Or-8w for user-mode-linux-devel@lists.sourceforge.net; Tue, 05 Feb 2008 08:38:04 -0800 Received: from qb-out-0506.google.com ([72.14.204.224]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1JMQZr-00089g-N9 for user-mode-linux-devel@lists.sourceforge.net; Tue, 05 Feb 2008 08:23:19 -0800 Received: by qb-out-0506.google.com with SMTP id c8so3387871qbc.4 for ; Tue, 05 Feb 2008 08:23:18 -0800 (PST) Date: Wed, 6 Feb 2008 00:20:09 +0800 From: WANG Cong Message-ID: <20080205162009.GB2966@hacking> References: <20080203171634.58ab668b.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20080203171634.58ab668b.akpm@linux-foundation.org> Subject: [uml-devel] [-mm Patch] arch/um/kernel/mem.c: fix a shadowed variable Reply-To: WANG Cong List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: Jeff Dike , linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Fix a shadowed variable in arch/um/kernel/mem.c, since there is a global variable has the same name. Cc: Jeff Dike Signed-off-by: WANG Cong --- Index: linux/arch/um/kernel/mem.c =================================================================== --- linux.orig/arch/um/kernel/mem.c +++ linux/arch/um/kernel/mem.c @@ -299,7 +299,7 @@ void show_mem(void) { int pfn, total = 0, reserved = 0; int shared = 0, cached = 0; - int highmem = 0; + int high_mem = 0; struct page *page; printk(KERN_INFO "Mem-info:\n"); @@ -311,7 +311,7 @@ void show_mem(void) page = pfn_to_page(pfn); total++; if (PageHighMem(page)) - highmem++; + high_mem++; if (PageReserved(page)) reserved++; else if (PageSwapCache(page)) @@ -320,7 +320,7 @@ void show_mem(void) shared += page_count(page) - 1; } printk(KERN_INFO "%d pages of RAM\n", total); - printk(KERN_INFO "%d pages of HIGHMEM\n", highmem); + printk(KERN_INFO "%d pages of HIGHMEM\n", high_mem); printk(KERN_INFO "%d reserved pages\n", reserved); printk(KERN_INFO "%d pages shared\n", shared); printk(KERN_INFO "%d pages swap cached\n", cached); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759161AbYBEQXk (ORCPT ); Tue, 5 Feb 2008 11:23:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758925AbYBEQXW (ORCPT ); Tue, 5 Feb 2008 11:23:22 -0500 Received: from po-out-1718.google.com ([72.14.252.156]:57896 "EHLO po-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755208AbYBEQXU (ORCPT ); Tue, 5 Feb 2008 11:23:20 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=fT0bOEb6BHDQgYYi5t+ifn9rXyqprZsVIVLkrfSgUhp46fAJkirnIWRPDzOji+cahnLza0IqGhIOu8Sa98NncROoEkmlV4AkgxCdxXohQwaC/vRVR2jQbATsF2ClvlQy5L8dBwsnQVQnuYRzjQB+ZcY0WLaaIt4fz8YpxdkOCRQ= Date: Wed, 6 Feb 2008 00:20:09 +0800 From: WANG Cong To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Jeff Dike , user-mode-linux-devel@lists.sourceforge.net Subject: [-mm Patch] arch/um/kernel/mem.c: fix a shadowed variable Message-ID: <20080205162009.GB2966@hacking> Reply-To: WANG Cong References: <20080203171634.58ab668b.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080203171634.58ab668b.akpm@linux-foundation.org> User-Agent: Mutt/1.5.14 (2007-02-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a shadowed variable in arch/um/kernel/mem.c, since there is a global variable has the same name. Cc: Jeff Dike Signed-off-by: WANG Cong --- Index: linux/arch/um/kernel/mem.c =================================================================== --- linux.orig/arch/um/kernel/mem.c +++ linux/arch/um/kernel/mem.c @@ -299,7 +299,7 @@ void show_mem(void) { int pfn, total = 0, reserved = 0; int shared = 0, cached = 0; - int highmem = 0; + int high_mem = 0; struct page *page; printk(KERN_INFO "Mem-info:\n"); @@ -311,7 +311,7 @@ void show_mem(void) page = pfn_to_page(pfn); total++; if (PageHighMem(page)) - highmem++; + high_mem++; if (PageReserved(page)) reserved++; else if (PageSwapCache(page)) @@ -320,7 +320,7 @@ void show_mem(void) shared += page_count(page) - 1; } printk(KERN_INFO "%d pages of RAM\n", total); - printk(KERN_INFO "%d pages of HIGHMEM\n", highmem); + printk(KERN_INFO "%d pages of HIGHMEM\n", high_mem); printk(KERN_INFO "%d reserved pages\n", reserved); printk(KERN_INFO "%d pages shared\n", shared); printk(KERN_INFO "%d pages swap cached\n", cached);