diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-06-06 21:43:19 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-06-06 21:43:19 -0400 |
| commit | 9ca1797ac2944461d0c606fc64c325a20b69070a (patch) | |
| tree | ecb310c8aa7cfc617cd1028bf2562f7d87f145d7 /arch/um | |
| parent | d7e8df59031d6d33f7e95b8baae653f1d41f1171 (diff) | |
| parent | a2d09e92ec5a7ee46e55d29ce8ad5afb45b02d37 (diff) | |
Merge tag 'v3.2.46' into v3.2-rt
This is the 3.2.46 stable release
Conflicts:
kernel/timer.c
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index aa365c55ecf9..5888f1b83477 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -69,6 +69,8 @@ extern unsigned long end_iomem; #define PAGE_KERNEL __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED) #define PAGE_KERNEL_EXEC __pgprot(__PAGE_KERNEL_EXEC) +#define io_remap_pfn_range remap_pfn_range + /* * The i386 can't do page protection for execute, and considers that the same * are read. |