diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
| commit | 9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch) | |
| tree | 569b5a13b3f7030a603460d8d9ded035a6f7f48f /fs/proc/page.c | |
| parent | 897493504addc5609f04a2c4f73c37ab972c29b2 (diff) | |
| parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'fs/proc/page.c')
| -rw-r--r-- | fs/proc/page.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/page.c b/fs/proc/page.c index 180cf5a0bd67..3b8b45660331 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c | |||
| @@ -146,7 +146,7 @@ u64 stable_page_flags(struct page *page) | |||
| 146 | u |= kpf_copy_bit(k, KPF_HWPOISON, PG_hwpoison); | 146 | u |= kpf_copy_bit(k, KPF_HWPOISON, PG_hwpoison); |
| 147 | #endif | 147 | #endif |
| 148 | 148 | ||
| 149 | #ifdef CONFIG_IA64_UNCACHED_ALLOCATOR | 149 | #ifdef CONFIG_ARCH_USES_PG_UNCACHED |
| 150 | u |= kpf_copy_bit(k, KPF_UNCACHED, PG_uncached); | 150 | u |= kpf_copy_bit(k, KPF_UNCACHED, PG_uncached); |
| 151 | #endif | 151 | #endif |
| 152 | 152 | ||