aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/pgtable.h
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-06-08 14:13:36 +0530
committerChirayu Desai <cdesai@cyanogenmod.org>2013-06-08 14:13:36 +0530
commit0ea6eab87c85317af3fc549950715b9e42795706 (patch)
tree59668f4c72c2a3b5640ae212864013644b6911ce /arch/um/include/asm/pgtable.h
parentad5ca4cbf2df1d5e30269097e57ddbf13d8c189d (diff)
parent1e18293a23fdc4e28b07302ad6a5ed99f7a26348 (diff)
downloadkernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.zip
kernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.tar.gz
kernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.tar.bz2
Merge tag 'v3.0.81' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.81 stable release
Diffstat (limited to 'arch/um/include/asm/pgtable.h')
-rw-r--r--arch/um/include/asm/pgtable.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h
index aa365c5..5888f1b 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.