diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /mm/page_alloc.c | |
parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) |
Merge branch 'master'
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c5823c395f71..ae2903339e71 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/pagemap.h> | 22 | #include <linux/pagemap.h> |
23 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
24 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
25 | #include <linux/kernel.h> | ||
25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
26 | #include <linux/suspend.h> | 27 | #include <linux/suspend.h> |
27 | #include <linux/pagevec.h> | 28 | #include <linux/pagevec.h> |
@@ -117,7 +118,7 @@ static void bad_page(const char *function, struct page *page) | |||
117 | set_page_count(page, 0); | 118 | set_page_count(page, 0); |
118 | reset_page_mapcount(page); | 119 | reset_page_mapcount(page); |
119 | page->mapping = NULL; | 120 | page->mapping = NULL; |
120 | tainted |= TAINT_BAD_PAGE; | 121 | add_taint(TAINT_BAD_PAGE); |
121 | } | 122 | } |
122 | 123 | ||
123 | #ifndef CONFIG_HUGETLB_PAGE | 124 | #ifndef CONFIG_HUGETLB_PAGE |