From: Wu Fengguang <fengguang.wu@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>
To: Ingo Molnar <mingo@redhat.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Andi Kleen <andi@firstfloor.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Yinghai Lu <yinghai@kernel.org>,
Wu Fengguang <fengguang.wu@intel.com>
Cc: x86@kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: shaohui.zheng@intel.com
Subject: [PATCH 3/3] x86: use the generic page_is_ram()
Date: Fri, 22 Jan 2010 11:21:05 +0800 [thread overview]
Message-ID: <20100122033004.470767217@intel.com> (raw)
In-Reply-To: 20100122032102.137106635@intel.com
[-- Attachment #1: x86-page-is-ram.patch --]
[-- Type: text/plain, Size: 1520 bytes --]
The generic resource based page_is_ram() works better with memory
hotplug/hotremove. So switch the x86 e820map based code to it.
CC: Andi Kleen <andi@firstfloor.org>
CC: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
CC: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
arch/x86/include/asm/page_types.h | 1 -
arch/x86/mm/ioremap.c | 21 ---------------------
2 files changed, 22 deletions(-)
--- linux-mm.orig/arch/x86/include/asm/page_types.h 2010-01-22 11:20:29.000000000 +0800
+++ linux-mm/arch/x86/include/asm/page_types.h 2010-01-22 11:20:39.000000000 +0800
@@ -40,7 +40,6 @@
#ifndef __ASSEMBLY__
-extern int page_is_ram(unsigned long pagenr);
extern int devmem_is_allowed(unsigned long pagenr);
extern unsigned long max_low_pfn_mapped;
--- linux-mm.orig/arch/x86/mm/ioremap.c 2010-01-22 11:20:37.000000000 +0800
+++ linux-mm/arch/x86/mm/ioremap.c 2010-01-22 11:20:39.000000000 +0800
@@ -24,27 +24,6 @@
#include "physaddr.h"
-int page_is_ram(unsigned long pagenr)
-{
- resource_size_t addr, end;
- int i;
-
- for (i = 0; i < e820.nr_map; i++) {
- /*
- * Not usable memory:
- */
- if (e820.map[i].type != E820_RAM)
- continue;
- addr = (e820.map[i].addr + PAGE_SIZE-1) >> PAGE_SHIFT;
- end = (e820.map[i].addr + e820.map[i].size) >> PAGE_SHIFT;
-
-
- if ((pagenr >= addr) && (pagenr < end))
- return 1;
- }
- return 0;
-}
-
/*
* Fix up the linear direct mapping of the kernel to avoid cache attribute
* conflicts.
next prev parent reply other threads:[~2010-01-22 3:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-22 3:21 [PATCH 0/3] generic hotplug friendly page_is_ram() Wu Fengguang
2010-01-22 3:21 ` [PATCH 1/3] resources: introduce generic page_is_ram() Wu Fengguang
2010-01-22 4:10 ` KAMEZAWA Hiroyuki
2010-01-22 4:20 ` [PATCH 1/3 v3] " Wu Fengguang
2010-01-22 5:15 ` [PATCH 1/3] " Xiaotian Feng
2010-01-22 5:37 ` Wu Fengguang
2010-01-22 5:50 ` Xiaotian Feng
2010-01-22 5:52 ` Wu Fengguang
2010-01-22 7:51 ` H. Peter Anvin
2010-01-22 8:16 ` [PATCH 1/3 v4] " Wu Fengguang
2010-01-27 0:30 ` Andrew Morton
2010-01-27 3:06 ` Wu Fengguang
2010-02-02 1:01 ` [tip:x86/mm] Move page_is_ram() declaration to mm.h tip-bot for Wu Fengguang
2010-01-22 3:21 ` [PATCH 2/3] x86: remove bios data range from e820 Wu Fengguang
2010-01-22 4:06 ` Wu Fengguang
2010-01-27 0:32 ` Andrew Morton
2010-02-02 1:01 ` [tip:x86/mm] x86: Remove BIOS " tip-bot for Yinghai Lu
2010-01-22 3:21 ` Wu Fengguang [this message]
2010-02-02 1:01 ` [tip:x86/mm] x86: Use the generic page_is_ram() tip-bot for Wu Fengguang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100122033004.470767217@intel.com \
--to=fengguang.wu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox