From 698488a629b7dea237140a26a3b94aad1c93cbee Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 25 Oct 2009 11:25:50 +0000 Subject: [PATCH] --- yaml --- r: 172383 b: refs/heads/master c: b7dc0b2cfc6e9bc7270915c642a8a8e999b6095e h: refs/heads/master i: 172381: 12411fdf822eca8044e4511e26e4c07e8b17fdab 172379: 50fc1c90c311a3dc2f27d01d9d2fe51793b17571 172375: 4f4540bbe6d3c8d30a96c135f41e4f7f38e86446 172367: e33d1927cd97d36f3ae0b360eb20f9eb91da4c7a 172351: dbb32306ea1c978f4a396cc9bdf39f9086f5098d v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/flush.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ab0d70ed3dd..2ead6b3e6498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f0b192633f1fbf253b21c90938733491549edae +refs/heads/master: b7dc0b2cfc6e9bc7270915c642a8a8e999b6095e diff --git a/trunk/arch/arm/mm/flush.c b/trunk/arch/arm/mm/flush.c index a480f161a4bb..43474d8752a6 100644 --- a/trunk/arch/arm/mm/flush.c +++ b/trunk/arch/arm/mm/flush.c @@ -111,6 +111,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, void __flush_dcache_page(struct address_space *mapping, struct page *page) { + void *addr = page_address(page); + /* * Writeback any data associated with the kernel mapping of this * page. This ensures that data in the physical page is mutually @@ -121,9 +123,9 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page) * kmap_atomic() doesn't set the page virtual address, and * kunmap_atomic() takes care of cache flushing already. */ - if (page_address(page)) + if (addr) #endif - __cpuc_flush_dcache_page(page_address(page)); + __cpuc_flush_dcache_page(addr); /* * If this is a page cache page, and we have an aliasing VIPT cache,