diff --git a/[refs] b/[refs] index 7f838fe930f1..6d873ed6641f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3375ac767b847127df57d186a26abf83d055982 +refs/heads/master: e713a21d8251a4c91772f592af46407dfb0b2e4f diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 5c44ed49ca93..daa36f103e77 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -331,7 +331,7 @@ static int destroy_compound_page(struct page *page, unsigned long order) for (i = 1; i < nr_pages; i++) { struct page *p = page + i; - if (unlikely(!PageTail(p) | (p->first_page != page))) { + if (unlikely(!PageTail(p) || (p->first_page != page))) { bad_page(page); bad++; }