diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:38:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:38:45 -0800 |
| commit | 46bbffad54bd48bb809f2691c1970a79a588976b (patch) | |
| tree | 21779a574f118b1cba5d6832bc0a0fa3bee97075 /kernel/resource.c | |
| parent | 85fe20bfd415af0a2e93bd1166533d4a6eb591ea (diff) | |
| parent | c1fd1b43831fa20c91cdd461342af8edf2e87c2f (diff) | |
| download | blackbird-op-linux-46bbffad54bd48bb809f2691c1970a79a588976b.tar.gz blackbird-op-linux-46bbffad54bd48bb809f2691c1970a79a588976b.zip | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mm: Unify kernel_physical_mapping_init() API
x86, mm: Allow highmem user page tables to be disabled at boot time
x86: Do not reserve brk for DMI if it's not going to be used
x86: Convert tlbstate_lock to raw_spinlock
x86: Use the generic page_is_ram()
x86: Remove BIOS data range from e820
Move page_is_ram() declaration to mm.h
Generic page_is_ram: use __weak
resources: introduce generic page_is_ram()
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 24e9e60c1459..4e9d87fd7bc5 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -327,6 +327,19 @@ int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, #endif +static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg) +{ + return 1; +} +/* + * This generic page_is_ram() returns true if specified address is + * registered as "System RAM" in iomem_resource list. + */ +int __weak page_is_ram(unsigned long pfn) +{ + return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1; +} + /* * Find empty slot in the resource tree given range and alignment. */ |
