From ba2801e936fd6b68d85c0b6f884ee64966841b5c Mon Sep 17 00:00:00 2001 From: Venkatesh Pallipadi Date: Fri, 10 Jul 2009 09:57:37 -0700 Subject: [PATCH] --- yaml --- r: 161398 b: refs/heads/master c: 46cf98cdaef5471926010b5bddf84c44ec177fdd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/Kconfig | 4 ++++ trunk/arch/x86/Kconfig | 4 ++++ trunk/include/linux/page-flags.h | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fcde403f6f6d..9567a8c51541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 335ef896d4c6639849d79367f0fef9abc06d121b +refs/heads/master: 46cf98cdaef5471926010b5bddf84c44ec177fdd diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index 170042b420d4..e6246119932a 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/arch/ia64/Kconfig @@ -112,6 +112,10 @@ config IA64_UNCACHED_ALLOCATOR bool select GENERIC_ALLOCATOR +config ARCH_USES_PG_UNCACHED + def_bool y + depends on IA64_UNCACHED_ALLOCATOR + config AUDIT_ARCH bool default y diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index c07f72205909..8e1595382196 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1414,6 +1414,10 @@ config X86_PAT If unsure, say Y. +config ARCH_USES_PG_UNCACHED + def_bool y + depends on X86_PAT + config EFI bool "EFI runtime service support" depends on ACPI diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h index e2e5ce543595..2b87acfc5f87 100644 --- a/trunk/include/linux/page-flags.h +++ b/trunk/include/linux/page-flags.h @@ -99,7 +99,7 @@ enum pageflags { #ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT PG_mlocked, /* Page is vma mlocked */ #endif -#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR +#ifdef CONFIG_ARCH_USES_PG_UNCACHED PG_uncached, /* Page has been mapped as uncached */ #endif __NR_PAGEFLAGS, @@ -257,7 +257,7 @@ PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked) TESTCLEARFLAG_FALSE(Mlocked) #endif -#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR +#ifdef CONFIG_ARCH_USES_PG_UNCACHED PAGEFLAG(Uncached, uncached) #else PAGEFLAG_FALSE(Uncached)