aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorZiyann <jaraidaniel@gmail.com>2014-11-26 11:37:03 +0100
committerZiyann <jaraidaniel@gmail.com>2014-11-26 11:37:03 +0100
commite90611725bc4dcc8946e74c38bb2c58fdf6bf98f (patch)
treea6a2441a53406a47f3a4b4a5103c0a067aaab445 /drivers/base
parentda82942bbd6a40cf7ddd3edc52352610905137ce (diff)
parent5dba9ddd98cbc7ad319d687887981a0ea0062c75 (diff)
downloadkernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.zip
kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.gz
kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.bz2
Merge remote-tracking branch 'linux/linux-3.0.y' into stable-newpvr
Conflicts: arch/arm/include/asm/hardware/cache-l2x0.h
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/memory.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 5fb6aae..02653fc 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -172,6 +172,8 @@ static ssize_t show_mem_removable(struct sys_device *dev,
container_of(dev, struct memory_block, sysdev);
for (i = 0; i < sections_per_block; i++) {
+ if (!present_section_nr(mem->start_section_nr + i))
+ continue;
pfn = section_nr_to_pfn(mem->start_section_nr + i);
ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
}