aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-28 08:09:27 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-28 08:22:44 -0500
commit92b9af9e4f144535c65aee673cfad309f25fa465 (patch)
treee595675e24fba414396dd1efcef380bfa932beaa
parent778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff)
x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
Impact: build fix Theodore Ts reported that the i915 driver needs these symbols: ERROR: "pgprot_writecombine" [drivers/gpu/drm/i915/i915.ko] undefined! ERROR: "is_io_mapping_possible" [drivers/gpu/drm/i915/i915.ko] undefined! Reported-by: Theodore Ts'o <tytso@mit.edu> wrote: Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/mm/iomap_32.c15
-rw-r--r--arch/x86/mm/pat.c2
2 files changed, 6 insertions, 11 deletions
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index 6c2b1af16926..04102d42ff42 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -20,23 +20,16 @@
20#include <asm/pat.h> 20#include <asm/pat.h>
21#include <linux/module.h> 21#include <linux/module.h>
22 22
23#ifdef CONFIG_X86_PAE 23int is_io_mapping_possible(resource_size_t base, unsigned long size)
24int
25is_io_mapping_possible(resource_size_t base, unsigned long size)
26{
27 return 1;
28}
29#else
30int
31is_io_mapping_possible(resource_size_t base, unsigned long size)
32{ 24{
25#ifndef CONFIG_X86_PAE
33 /* There is no way to map greater than 1 << 32 address without PAE */ 26 /* There is no way to map greater than 1 << 32 address without PAE */
34 if (base + size > 0x100000000ULL) 27 if (base + size > 0x100000000ULL)
35 return 0; 28 return 0;
36 29#endif
37 return 1; 30 return 1;
38} 31}
39#endif 32EXPORT_SYMBOL_GPL(is_io_mapping_possible);
40 33
41/* Map 'pfn' using fixed map 'type' and protections 'prot' 34/* Map 'pfn' using fixed map 'type' and protections 'prot'
42 */ 35 */
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index aebbf67a79d0..e0ab173b6974 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -11,6 +11,7 @@
11#include <linux/bootmem.h> 11#include <linux/bootmem.h>
12#include <linux/debugfs.h> 12#include <linux/debugfs.h>
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/module.h>
14#include <linux/gfp.h> 15#include <linux/gfp.h>
15#include <linux/mm.h> 16#include <linux/mm.h>
16#include <linux/fs.h> 17#include <linux/fs.h>
@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot)
868 else 869 else
869 return pgprot_noncached(prot); 870 return pgprot_noncached(prot);
870} 871}
872EXPORT_SYMBOL_GPL(pgprot_writecombine);
871 873
872#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) 874#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)
873 875