diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /mm/internal.h | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'mm/internal.h')
| -rw-r--r-- | mm/internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/internal.h b/mm/internal.h index 953f941ea867..5a9a6200e034 100644 --- a/mm/internal.h +++ b/mm/internal.h | |||
| @@ -24,7 +24,7 @@ static inline void set_page_count(struct page *page, int v) | |||
| 24 | */ | 24 | */ |
| 25 | static inline void set_page_refcounted(struct page *page) | 25 | static inline void set_page_refcounted(struct page *page) |
| 26 | { | 26 | { |
| 27 | VM_BUG_ON(PageCompound(page) && PageTail(page)); | 27 | VM_BUG_ON(PageTail(page)); |
| 28 | VM_BUG_ON(atomic_read(&page->_count)); | 28 | VM_BUG_ON(atomic_read(&page->_count)); |
| 29 | set_page_count(page, 1); | 29 | set_page_count(page, 1); |
| 30 | } | 30 | } |
| @@ -34,7 +34,7 @@ static inline void __put_page(struct page *page) | |||
| 34 | atomic_dec(&page->_count); | 34 | atomic_dec(&page->_count); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | extern void fastcall __init __free_pages_bootmem(struct page *page, | 37 | extern void __init __free_pages_bootmem(struct page *page, |
| 38 | unsigned int order); | 38 | unsigned int order); |
| 39 | 39 | ||
| 40 | /* | 40 | /* |