From 1e6ee168ac39dce89c876fcffe0ee0f712aa6b47 Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 6 Apr 2010 14:35:08 -0700 Subject: [PATCH] --- yaml --- r: 189579 b: refs/heads/master c: ea56f411ec2d4d8689eb7f3bcd24e860acf87c47 h: refs/heads/master i: 189577: 37a6ded4d6f6d1e5fc2d71ad2b9a8271b1963f68 189575: db39ae436b97bfb9aa5581991d201b05d815935b v: v3 --- [refs] | 2 +- trunk/drivers/char/mem.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1dd51820a0c1..1f4cab36a0a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c783a29efcbc90a90ccfec8956c7ff0854301c34 +refs/heads/master: ea56f411ec2d4d8689eb7f3bcd24e860acf87c47 diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c index 9cdbadc68608..f54dab8acdcd 100644 --- a/trunk/drivers/char/mem.c +++ b/trunk/drivers/char/mem.c @@ -225,6 +225,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file, * outside of main memory. * */ +#ifdef pgprot_noncached static int uncached_access(struct file *file, unsigned long addr) { #if defined(CONFIG_IA64) @@ -251,6 +252,7 @@ static int uncached_access(struct file *file, unsigned long addr) return addr >= __pa(high_memory); #endif } +#endif static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot)