From: Juergen Gross <jgross@suse.com>
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 <jgross@suse.com>
Subject: [PATCH 13/17] x86: Clean up pgtable_types.h
Date: Fri, 31 Oct 2014 15:00:29 +0100 [thread overview]
Message-ID: <1414764033-30011-14-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1414764033-30011-1-git-send-email-jgross@suse.com>
Remove no longer used defines from pgtable_types.h as they are not
used any longer.
Switch __PAGE_KERNEL_NOCACHE to use cache mode type instead of pte
bits.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/include/asm/pgtable_types.h | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 5124642..6d5f6d1 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -128,11 +128,6 @@
_PAGE_SOFT_DIRTY | _PAGE_NUMA)
#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE | _PAGE_NUMA)
-#define _PAGE_CACHE_WB (0)
-#define _PAGE_CACHE_WC (_PAGE_PWT)
-#define _PAGE_CACHE_UC_MINUS (_PAGE_PCD)
-#define _PAGE_CACHE_UC (_PAGE_PCD | _PAGE_PWT)
-
/*
* The cache modes defined here are used to translate between pure SW usage
* and the HW defined cache mode bits and/or PAT entries.
@@ -178,41 +173,27 @@ enum page_cache_mode {
#define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
#define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
-#define __PAGE_KERNEL_EXEC_NOCACHE (__PAGE_KERNEL_EXEC | _PAGE_PCD | _PAGE_PWT)
-#define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
-#define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
-#define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
+#define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
#define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
-#define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
#define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
-#define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
#define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
#define __PAGE_KERNEL_IO (__PAGE_KERNEL)
#define __PAGE_KERNEL_IO_NOCACHE (__PAGE_KERNEL_NOCACHE)
-#define __PAGE_KERNEL_IO_UC_MINUS (__PAGE_KERNEL_UC_MINUS)
-#define __PAGE_KERNEL_IO_WC (__PAGE_KERNEL_WC)
#define PAGE_KERNEL __pgprot(__PAGE_KERNEL)
#define PAGE_KERNEL_RO __pgprot(__PAGE_KERNEL_RO)
#define PAGE_KERNEL_EXEC __pgprot(__PAGE_KERNEL_EXEC)
#define PAGE_KERNEL_RX __pgprot(__PAGE_KERNEL_RX)
-#define PAGE_KERNEL_WC __pgprot(__PAGE_KERNEL_WC)
#define PAGE_KERNEL_NOCACHE __pgprot(__PAGE_KERNEL_NOCACHE)
-#define PAGE_KERNEL_UC_MINUS __pgprot(__PAGE_KERNEL_UC_MINUS)
-#define PAGE_KERNEL_EXEC_NOCACHE __pgprot(__PAGE_KERNEL_EXEC_NOCACHE)
#define PAGE_KERNEL_LARGE __pgprot(__PAGE_KERNEL_LARGE)
-#define PAGE_KERNEL_LARGE_NOCACHE __pgprot(__PAGE_KERNEL_LARGE_NOCACHE)
#define PAGE_KERNEL_LARGE_EXEC __pgprot(__PAGE_KERNEL_LARGE_EXEC)
#define PAGE_KERNEL_VSYSCALL __pgprot(__PAGE_KERNEL_VSYSCALL)
#define PAGE_KERNEL_VVAR __pgprot(__PAGE_KERNEL_VVAR)
-#define PAGE_KERNEL_VVAR_NOCACHE __pgprot(__PAGE_KERNEL_VVAR_NOCACHE)
#define PAGE_KERNEL_IO __pgprot(__PAGE_KERNEL_IO)
#define PAGE_KERNEL_IO_NOCACHE __pgprot(__PAGE_KERNEL_IO_NOCACHE)
-#define PAGE_KERNEL_IO_UC_MINUS __pgprot(__PAGE_KERNEL_IO_UC_MINUS)
-#define PAGE_KERNEL_IO_WC __pgprot(__PAGE_KERNEL_IO_WC)
/* xwr */
#define __P000 PAGE_NONE
--
1.8.4.5
next prev parent reply other threads:[~2014-10-31 14:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 14:00 [PATCH 00/17] x86: Full support of PAT Juergen Gross
2014-10-31 14:00 ` [PATCH 01/17] x86: Make page cache mode a real type Juergen Gross
2014-10-31 19:42 ` Borislav Petkov
2014-10-31 20:23 ` Konrad Rzeszutek Wilk
2014-10-31 20:35 ` Borislav Petkov
2014-11-03 6:36 ` Juergen Gross
2014-11-03 10:31 ` Thomas Gleixner
2014-10-31 20:28 ` Thomas Gleixner
2014-10-31 14:00 ` [PATCH 02/17] x86: Use new cache mode type in include/asm/fb.h Juergen Gross
2014-10-31 14:00 ` [PATCH 03/17] x86: Use new cache mode type in drivers/video/fbdev/gbefb.c Juergen Gross
2014-10-31 14:00 ` [PATCH 04/17] x86: Use new cache mode type in drivers/video/fbdev/vermilion Juergen Gross
2014-10-31 14:00 ` [PATCH 05/17] x86: Use new cache mode type in arch/x86/pci Juergen Gross
2014-10-31 14:00 ` [PATCH 06/17] x86: Use new cache mode type in arch/x86/mm/init_64.c Juergen Gross
2014-10-31 14:00 ` [PATCH 07/17] x86: Use new cache mode type in asm/pgtable.h Juergen Gross
2014-10-31 14:00 ` [PATCH 08/17] x86: Use new cache mode type in mm/iomap_32.c Juergen Gross
2014-10-31 14:00 ` [PATCH 09/17] x86: Use new cache mode type in track_pfn_remap() and track_pfn_insert() Juergen Gross
2014-10-31 14:00 ` [PATCH 10/17] x86: Use new cache mode type in setting page attributes Juergen Gross
2014-10-31 15:34 ` Thomas Gleixner
2014-11-03 6:32 ` Juergen Gross
2014-11-03 10:31 ` Thomas Gleixner
2014-10-31 14:00 ` [PATCH 11/17] x86: Use new cache mode type in mm/ioremap.c Juergen Gross
2014-10-31 14:00 ` [PATCH 12/17] x86: Use new cache mode type in memtype related functions Juergen Gross
2014-10-31 14:00 ` Juergen Gross [this message]
2014-10-31 14:00 ` [PATCH 14/17] x86: Support PAT bit in pagetable dump for lower levels Juergen Gross
2014-10-31 14:00 ` [PATCH 15/17] x86: Respect PAT bit when copying pte values between large and normal pages Juergen Gross
2014-10-31 14:00 ` [PATCH 16/17] x86: Enable PAT to use cache mode translation tables Juergen Gross
2014-10-31 14:00 ` [PATCH 17/17] xen: Support Xen pv-domains using PAT Juergen Gross
2014-10-31 14:06 ` [PATCH 00/17] x86: Full support of PAT Ingo Molnar
2014-10-31 14:08 ` Juergen Gross
2014-10-31 18:53 ` Thomas Gleixner
2014-11-03 6:44 ` Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414764033-30011-14-git-send-email-jgross@suse.com \
--to=jgross@suse.com \
--cc=bhelgaas@google.com \
--cc=david.vrabel@citrix.com \
--cc=hpa@zytor.com \
--cc=jbeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=plagnioj@jcrosoft.com \
--cc=stefan.bader@canonical.com \
--cc=tglx@linutronix.de \
--cc=tomi.valkeinen@ti.com \
--cc=toshi.kani@hp.com \
--cc=ville.syrjala@linux.intel.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®