diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:47:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:47:54 -0500 |
| commit | 329b10bb0feacb7fb9a41389313ff0a51ae56f2a (patch) | |
| tree | a5b2d136589c90e36f87da7bab312109314c21b3 | |
| parent | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (diff) | |
| parent | 7bebd83dbf096d0bf4b4bfbaf5d8844a05f5eafc (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix off-by-1 error in TSB grow check.
| -rw-r--r-- | arch/sparc64/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index d21ff3230c02..0db2f7d9fab5 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
| @@ -413,12 +413,12 @@ good_area: | |||
| 413 | #ifdef CONFIG_HUGETLB_PAGE | 413 | #ifdef CONFIG_HUGETLB_PAGE |
| 414 | mm_rss -= (mm->context.huge_pte_count * (HPAGE_SIZE / PAGE_SIZE)); | 414 | mm_rss -= (mm->context.huge_pte_count * (HPAGE_SIZE / PAGE_SIZE)); |
| 415 | #endif | 415 | #endif |
| 416 | if (unlikely(mm_rss >= | 416 | if (unlikely(mm_rss > |
| 417 | mm->context.tsb_block[MM_TSB_BASE].tsb_rss_limit)) | 417 | mm->context.tsb_block[MM_TSB_BASE].tsb_rss_limit)) |
| 418 | tsb_grow(mm, MM_TSB_BASE, mm_rss); | 418 | tsb_grow(mm, MM_TSB_BASE, mm_rss); |
| 419 | #ifdef CONFIG_HUGETLB_PAGE | 419 | #ifdef CONFIG_HUGETLB_PAGE |
| 420 | mm_rss = mm->context.huge_pte_count; | 420 | mm_rss = mm->context.huge_pte_count; |
| 421 | if (unlikely(mm_rss >= | 421 | if (unlikely(mm_rss > |
| 422 | mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit)) | 422 | mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit)) |
| 423 | tsb_grow(mm, MM_TSB_HUGE, mm_rss); | 423 | tsb_grow(mm, MM_TSB_HUGE, mm_rss); |
| 424 | #endif | 424 | #endif |