lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'x86/asm', 'x86/cleanups', 'x86/cpudetect', 'x86/debug', 'x86/doc', 'x86/header-fixes', 'x86/mm', 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-01-28 23:13:53 +01:00
parent 6a385db5ce 2d4d57db69 8f6d86dc41 b38b066590 d5e397cb49 e56d0cfe77 dbca1df48e fb746d0e13 6522869c34 d639bab8da 042cbaf88a 5662a2f8e7 3b4b75700a 30a0fb947a
commit 74b6eb6b93
36 changed files with 604 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/ioremap.c
View File

@ -367,7 +367,7 @@ EXPORT_SYMBOL(ioremap_nocache);
*
* Must be freed with iounmap.
*/
void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size)
{
if (pat_enabled)
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,