From 40f2644c08f9f52cf8d89f4ce373a909652e00b2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 9 Sep 2010 16:37:36 -0700
Subject: [PATCH] --- yaml --- r: 210448 b: refs/heads/master c:
 ed430fec756ad65f7cfba24f8ad17c3d5a403290 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/page.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 913ec82a0268..a2e89052cc08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85a0fdfd0f967507f3903e8419bc7e408f5a59de
+refs/heads/master: ed430fec756ad65f7cfba24f8ad17c3d5a403290
diff --git a/trunk/fs/proc/page.c b/trunk/fs/proc/page.c
index 180cf5a0bd67..3b8b45660331 100644
--- a/trunk/fs/proc/page.c
+++ b/trunk/fs/proc/page.c
@@ -146,7 +146,7 @@ u64 stable_page_flags(struct page *page)
 	u |= kpf_copy_bit(k, KPF_HWPOISON,	PG_hwpoison);
 #endif
 
-#ifdef CONFIG_IA64_UNCACHED_ALLOCATOR
+#ifdef CONFIG_ARCH_USES_PG_UNCACHED
 	u |= kpf_copy_bit(k, KPF_UNCACHED,	PG_uncached);
 #endif