diff --git a/[refs] b/[refs] index 5e455e3bf1db..2f4ede9ea35e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bde1965ce8c63e17cc284e1af616c85aba483f11 +refs/heads/master: 6ce9fc17d913ae51f8434d2826f306347820b07d diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c index 72880993af89..0b029c97174e 100644 --- a/trunk/arch/x86/mm/pageattr.c +++ b/trunk/arch/x86/mm/pageattr.c @@ -356,10 +356,8 @@ static int split_large_page(pte_t *kpte, unsigned long address) * up for us already: */ tmp = lookup_address(address, &level); - if (tmp != kpte) { - WARN_ON_ONCE(1); + if (tmp != kpte) goto out_unlock; - } address = __pa(address); addr = address & PMD_PAGE_MASK;