From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760551AbaJaOAq (ORCPT ); Fri, 31 Oct 2014 10:00:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38759 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759561AbaJaOAm (ORCPT ); Fri, 31 Oct 2014 10:00:42 -0400 From: Juergen Gross To: hpa@zytor.com, x86@kernel.org, tglx@linutronix.de, mingo@redhat.com, stefan.bader@canonical.com, linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com, konrad.wilk@oracle.com, ville.syrjala@linux.intel.com, david.vrabel@citrix.com, jbeulich@suse.com, toshi.kani@hp.com, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, bhelgaas@google.com Cc: Juergen Gross Subject: [PATCH 02/17] x86: Use new cache mode type in include/asm/fb.h Date: Fri, 31 Oct 2014 15:00:18 +0100 Message-Id: <1414764033-30011-3-git-send-email-jgross@suse.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1414764033-30011-1-git-send-email-jgross@suse.com> References: <1414764033-30011-1-git-send-email-jgross@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of directly using cache mode bits in the pte switch to usage of the new cache mode type. Signed-off-by: Stefan Bader Signed-off-by: Juergen Gross --- arch/x86/include/asm/fb.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h index 2519d06..c3dd5e7 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/fb.h @@ -8,8 +8,12 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { + unsigned long prot; + + prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK; if (boot_cpu_data.x86 > 3) - pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; + pgprot_val(vma->vm_page_prot) = + prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); } extern int fb_is_primary_device(struct fb_info *info); -- 1.8.4.5