Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
fix warning in io_mapping_map_wc()
x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
+10
-12
+4
-11
arch/x86/mm/iomap_32.c
+4
-11
arch/x86/mm/iomap_32.c
···
20
20
#include <asm/pat.h>
21
21
#include <linux/module.h>
22
22
23
-
#ifdef CONFIG_X86_PAE
24
-
int
25
-
is_io_mapping_possible(resource_size_t base, unsigned long size)
23
+
int is_io_mapping_possible(resource_size_t base, unsigned long size)
26
24
{
27
-
return 1;
28
-
}
29
-
#else
30
-
int
31
-
is_io_mapping_possible(resource_size_t base, unsigned long size)
32
-
{
25
+
#ifndef CONFIG_X86_PAE
33
26
/* There is no way to map greater than 1 << 32 address without PAE */
34
27
if (base + size > 0x100000000ULL)
35
28
return 0;
36
-
29
+
#endif
37
30
return 1;
38
31
}
39
-
#endif
32
+
EXPORT_SYMBOL_GPL(is_io_mapping_possible);
40
33
41
34
/* Map 'pfn' using fixed map 'type' and protections 'prot'
42
35
*/
+2
arch/x86/mm/pat.c
+2
arch/x86/mm/pat.c
···
11
11
#include <linux/bootmem.h>
12
12
#include <linux/debugfs.h>
13
13
#include <linux/kernel.h>
14
+
#include <linux/module.h>
14
15
#include <linux/gfp.h>
15
16
#include <linux/mm.h>
16
17
#include <linux/fs.h>
···
869
868
else
870
869
return pgprot_noncached(prot);
871
870
}
871
+
EXPORT_SYMBOL_GPL(pgprot_writecombine);
872
872
873
873
#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)
874
874
+4
-1
include/linux/io-mapping.h
+4
-1
include/linux/io-mapping.h
···
91
91
static inline void *
92
92
io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
93
93
{
94
+
resource_size_t phys_addr;
95
+
94
96
BUG_ON(offset >= mapping->size);
95
-
resource_size_t phys_addr = mapping->base + offset;
97
+
phys_addr = mapping->base + offset;
98
+
96
99
return ioremap_wc(phys_addr, PAGE_SIZE);
97
100
}
98
101