diff options
author | Chen, Kenneth W <kenneth.w.chen@intel.com> | 2006-03-22 13:49:00 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-03-22 17:35:08 -0500 |
commit | 2332c9ae7911618575241e0c843cd686968db8e3 (patch) | |
tree | 24363aeb963d00cb3aab67f9586eae78ac54dfd8 /arch | |
parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) |
[IA64] fix ia64 is_hugepage_only_range
fix is_hugepage_only_range() definition to be "overlaps"
instead of "within architectural restricted hugetlb address
range". Simplify the ia64 specific code that used to use
is_hugepage_only_range() to just check which region the
address is in.
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/mm/hugetlbpage.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c index 9dbc7dadd165..8d506710fdbd 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c | |||
@@ -113,8 +113,7 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, | |||
113 | unsigned long floor, unsigned long ceiling) | 113 | unsigned long floor, unsigned long ceiling) |
114 | { | 114 | { |
115 | /* | 115 | /* |
116 | * This is called only when is_hugepage_only_range(addr,), | 116 | * This is called to free hugetlb page tables. |
117 | * and it follows that is_hugepage_only_range(end,) also. | ||
118 | * | 117 | * |
119 | * The offset of these addresses from the base of the hugetlb | 118 | * The offset of these addresses from the base of the hugetlb |
120 | * region must be scaled down by HPAGE_SIZE/PAGE_SIZE so that | 119 | * region must be scaled down by HPAGE_SIZE/PAGE_SIZE so that |
@@ -126,9 +125,9 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, | |||
126 | 125 | ||
127 | addr = htlbpage_to_page(addr); | 126 | addr = htlbpage_to_page(addr); |
128 | end = htlbpage_to_page(end); | 127 | end = htlbpage_to_page(end); |
129 | if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE)) | 128 | if (REGION_NUMBER(floor) == RGN_HPAGE) |
130 | floor = htlbpage_to_page(floor); | 129 | floor = htlbpage_to_page(floor); |
131 | if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE)) | 130 | if (REGION_NUMBER(ceiling) == RGN_HPAGE) |
132 | ceiling = htlbpage_to_page(ceiling); | 131 | ceiling = htlbpage_to_page(ceiling); |
133 | 132 | ||
134 | free_pgd_range(tlb, addr, end, floor, ceiling); | 133 | free_pgd_range(tlb, addr, end, floor, ceiling); |