diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 12:44:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 12:44:55 -0400 |
commit | 4786b4ee22de6304e841b12ee22b849230d7fba3 (patch) | |
tree | 08793b8fbcd63204d5d3355ac755745adcfef170 /arch/ia64/mm/init.c | |
parent | 253ba4e79edc695b2925bd2ef34de06ff4d4070c (diff) | |
parent | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (27 commits)
[IA64] kdump: Add crash_save_vmcoreinfo for INIT
[IA64] Fix NUMA configuration issue
[IA64] Itanium Spec updates
[IA64] Untangle sync_icache_dcache() page size determination
[IA64] arch/ia64/kernel/: use time_* macros
[IA64] remove redundant display of free swap space in show_mem()
[IA64] make IOMMU respect the segment boundary limits
[IA64] kprobes: kprobe-booster for ia64
[IA64] fix getpid and set_tid_address fast system calls for pid namespaces
[IA64] Replace explicit jiffies tests with time_* macros.
[IA64] use goto to jump out do/while_each_thread
[IA64] Fix unlock ordering in smp_callin
[IA64] pgd_offset() constfication.
[IA64] kdump: crash.c coding style fix
[IA64] kdump: add kdump_on_fatal_mca
[IA64] Minimize per_cpu reservations.
[IA64] Correct pernodesize calculation.
[IA64] Kernel parameter for max number of concurrent global TLB purges
[IA64] Multiple outstanding ptc.g instruction support
[IA64] Implement smp_call_function_mask for ia64
...
Diffstat (limited to 'arch/ia64/mm/init.c')
-rw-r--r-- | arch/ia64/mm/init.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index a4ca657c72c6..5c1de53c8c1c 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 | ||
@@ -553,12 +547,10 @@ find_largest_hole (u64 start, u64 end, void *arg) | |||
553 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ | 547 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ |
554 | 548 | ||
555 | int __init | 549 | int __init |
556 | register_active_ranges(u64 start, u64 end, void *arg) | 550 | register_active_ranges(u64 start, u64 len, int nid) |
557 | { | 551 | { |
558 | int nid = paddr_to_nid(__pa(start)); | 552 | u64 end = start + len; |
559 | 553 | ||
560 | if (nid < 0) | ||
561 | nid = 0; | ||
562 | #ifdef CONFIG_KEXEC | 554 | #ifdef CONFIG_KEXEC |
563 | if (start > crashk_res.start && start < crashk_res.end) | 555 | if (start > crashk_res.start && start < crashk_res.end) |
564 | start = crashk_res.end; | 556 | start = crashk_res.end; |