OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: rename pat_wc_enabled to pat_enabled 

BTW, what does pat_wc_enabled stand for? Does it mean
"write-combining"?

Currently it is used to globally switch on or off PAT support.
Thus I renamed it to pat_enabled.
I think this increases readability (and hope that I didn't miss
something).

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann 2008-06-10 16:06:21 +02:00 committed by Ingo Molnar
parent cd7a4e936d
commit 499f8f84b8
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/ioremap.c
View File

@ -261,7 +261,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
{
/*
* Ideally, this should be:
* pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
* pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
*
* Till we fix all X drivers to use ioremap_wc(), we will use
* UC MINUS.
@ -285,7 +285,7 @@ EXPORT_SYMBOL(ioremap_nocache);
*/
void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
{
if (pat_wc_enabled)
if (pat_enabled)
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
__builtin_return_address(0));
else

2
arch/x86/mm/pageattr.c
View File

@ -805,7 +805,7 @@ int _set_memory_wc(unsigned long addr, int numpages)
int set_memory_wc(unsigned long addr, int numpages)
{
if (!pat_wc_enabled)
if (!pat_enabled)
return set_memory_uc(addr, numpages);
if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,

16
arch/x86/mm/pat.c
View File

@ -26,11 +26,11 @@
#include <asm/io.h>
#ifdef CONFIG_X86_PAT
int __read_mostly pat_wc_enabled = 1;
int __read_mostly pat_enabled = 1;
void __cpuinit pat_disable(char *reason)
{
pat_wc_enabled = 0;
pat_enabled = 0;
printk(KERN_INFO "%s\n", reason);
}
@ -72,7 +72,7 @@ void pat_init(void)
{
u64 pat;
if (!pat_wc_enabled)
if (!pat_enabled)
return;
/* Paranoia check. */
@ -225,8 +225,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
unsigned long actual_type;
int err = 0;
/* Only track when pat_wc_enabled */
if (!pat_wc_enabled) {
/* Only track when pat_enabled */
if (!pat_enabled) {
/* This is identical to page table setting without PAT */
if (ret_type) {
if (req_type == -1) {
@ -440,8 +440,8 @@ int free_memtype(u64 start, u64 end)
struct memtype *ml;
int err = -EINVAL;
/* Only track when pat_wc_enabled */
if (!pat_wc_enabled) {
/* Only track when pat_enabled */
if (!pat_enabled) {
return 0;
}
@ -535,7 +535,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
* caching for the high addresses through the KEN pin, but
* we maintain the tradition of paranoia in this code.
*/
if (!pat_wc_enabled &&
if (!pat_enabled &&
!(boot_cpu_has(X86_FEATURE_MTRR) ||
boot_cpu_has(X86_FEATURE_K6_MTRR) ||
boot_cpu_has(X86_FEATURE_CYRIX_ARR) ||

4
arch/x86/pci/i386.c
View File

@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
return -EINVAL;
prot = pgprot_val(vma->vm_page_prot);
if (pat_wc_enabled && write_combine)
if (pat_enabled && write_combine)
prot |= _PAGE_CACHE_WC;
else if (pat_wc_enabled || boot_cpu_data.x86 > 3)
else if (pat_enabled || boot_cpu_data.x86 > 3)
/*
* ioremap() and ioremap_nocache() defaults to UC MINUS for now.
* To avoid attribute conflicts, request UC MINUS here

4
include/asm-x86/pat.h
View File

@ -4,10 +4,10 @@
#include <linux/types.h>
#ifdef CONFIG_X86_PAT
extern int pat_wc_enabled;
extern int pat_enabled;
extern void validate_pat_support(struct cpuinfo_x86 *c);
#else
static const int pat_wc_enabled;
static const int pat_enabled;
static inline void validate_pat_support(struct cpuinfo_x86 *c) { }
#endif