From 4650d39a22c38eb2cd3c66cf28662dffda327d3f Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 20 Jan 2011 14:44:20 -0800 Subject: [PATCH] --- yaml --- r: 232011 b: refs/heads/master c: abb65272a190660790096628859e752172d822fd h: refs/heads/master i: 232009: 9398a04d54c0f72cc6915d682cca7f2753f25fd6 232007: d09696912c36238f43fda6627090cd4de781afd0 v: v3 --- [refs] | 2 +- trunk/mm/memblock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 25686b0b4a50..d6cfae54fe29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 453c719261c0b4030b2676124adb6e81c5fb6833 +refs/heads/master: abb65272a190660790096628859e752172d822fd diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c index 400dc62697d7..bdba245d8afd 100644 --- a/trunk/mm/memblock.c +++ b/trunk/mm/memblock.c @@ -683,13 +683,13 @@ int __init_memblock memblock_is_memory(phys_addr_t addr) int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) { - int idx = memblock_search(&memblock.reserved, base); + int idx = memblock_search(&memblock.memory, base); if (idx == -1) return 0; - return memblock.reserved.regions[idx].base <= base && - (memblock.reserved.regions[idx].base + - memblock.reserved.regions[idx].size) >= (base + size); + return memblock.memory.regions[idx].base <= base && + (memblock.memory.regions[idx].base + + memblock.memory.regions[idx].size) >= (base + size); } int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)