From 521450766061fd2c67b43d3d54d60c8b1c92e10e Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 11 Feb 2008 10:50:21 +0100 Subject: [PATCH] --- yaml --- r: 85975 b: refs/heads/master c: 8e31c2ac1101b09ad6c6d3539b032d312cc3302b h: refs/heads/master i: 85973: 5bfbf271f39ee4007a7dfd4e56a2e37fcb44bdc4 85971: c3773a8f3717c0102b8c86d69e38e6f7fdc64b2a 85967: 15a5a7b3bd57b62fd13efe98ba94b722daa1b0db v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pageattr.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 769341d773bf..0defed205799 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa65af3f92da39a686c8a3479426d15854fa27ab +refs/heads/master: 8e31c2ac1101b09ad6c6d3539b032d312cc3302b diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c index 3ee14996c829..e2a74ea11a53 100644 --- a/trunk/arch/x86/mm/pageattr.c +++ b/trunk/arch/x86/mm/pageattr.c @@ -513,7 +513,6 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) unsigned long address = cpa->vaddr; int do_split, err; unsigned int level; - struct page *kpte_page; pte_t *kpte, old_pte; repeat: @@ -532,10 +531,6 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) return -EINVAL; } - kpte_page = virt_to_page(kpte); - BUG_ON(PageLRU(kpte_page)); - BUG_ON(PageCompound(kpte_page)); - if (level == PG_LEVEL_4K) { pte_t new_pte; pgprot_t new_prot = pte_pgprot(old_pte);