diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
tree | bf591255b3f158222f90852d53c4279e6e7e9ced /mm/rmap.c | |
parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm/rmap.c')
-rw-r--r-- | mm/rmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -537,9 +537,6 @@ void page_add_new_anon_rmap(struct page *page, | |||
537 | */ | 537 | */ |
538 | void page_add_file_rmap(struct page *page) | 538 | void page_add_file_rmap(struct page *page) |
539 | { | 539 | { |
540 | BUG_ON(PageAnon(page)); | ||
541 | BUG_ON(!pfn_valid(page_to_pfn(page))); | ||
542 | |||
543 | if (atomic_inc_and_test(&page->_mapcount)) | 540 | if (atomic_inc_and_test(&page->_mapcount)) |
544 | __inc_page_state(nr_mapped); | 541 | __inc_page_state(nr_mapped); |
545 | } | 542 | } |