diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-04-09 16:05:41 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-04-09 16:05:41 -0400 |
commit | 273988fa4dffd1b1e6deb3de18b979a44e9d8732 (patch) | |
tree | f28645f5d5a5432bf0cd3f91318ce4709830f196 /arch/ia64/mm/init.c | |
parent | 5cf1f7cef1c67b5c81736f00e81a2890e07041b9 (diff) |
[IA64] Untangle sync_icache_dcache() page size determination
Untangle the chaos of page size determination in this function by
simply using PAGE_SIZE << compound_order().
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/init.c')
-rw-r--r-- | arch/ia64/mm/init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index a4ca657c72c6..da05893294b5 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -58,7 +58,6 @@ __ia64_sync_icache_dcache (pte_t pte) | |||
58 | { | 58 | { |
59 | unsigned long addr; | 59 | unsigned long addr; |
60 | struct page *page; | 60 | struct page *page; |
61 | unsigned long order; | ||
62 | 61 | ||
63 | page = pte_page(pte); | 62 | page = pte_page(pte); |
64 | addr = (unsigned long) page_address(page); | 63 | addr = (unsigned long) page_address(page); |
@@ -66,12 +65,7 @@ __ia64_sync_icache_dcache (pte_t pte) | |||
66 | if (test_bit(PG_arch_1, &page->flags)) | 65 | if (test_bit(PG_arch_1, &page->flags)) |
67 | return; /* i-cache is already coherent with d-cache */ | 66 | return; /* i-cache is already coherent with d-cache */ |
68 | 67 | ||
69 | if (PageCompound(page)) { | 68 | flush_icache_range(addr, addr + (PAGE_SIZE << compound_order(page))); |
70 | order = compound_order(page); | ||
71 | flush_icache_range(addr, addr + (1UL << order << PAGE_SHIFT)); | ||
72 | } | ||
73 | else | ||
74 | flush_icache_range(addr, addr + PAGE_SIZE); | ||
75 | set_bit(PG_arch_1, &page->flags); /* mark page as clean */ | 69 | set_bit(PG_arch_1, &page->flags); /* mark page as clean */ |
76 | } | 70 | } |
77 | 71 | ||