summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorIngo Molnar2011-03-08 17:21:49 +0100
committerIngo Molnar2011-03-08 17:21:52 +0100
commit86cb2ec7b22a0a89b8660110dc03321fadbef45f (patch)
treec4162b0ab7c4e3602e2b7a6a6fd47c55c3315fea /include/asm-generic
parentperf report tui: Improve multi event session support (diff)
parentLinux 2.6.38-rc8 (diff)
downloadkernel-qcow2-linux-86cb2ec7b22a0a89b8660110dc03321fadbef45f.tar.gz
kernel-qcow2-linux-86cb2ec7b22a0a89b8660110dc03321fadbef45f.tar.xz
kernel-qcow2-linux-86cb2ec7b22a0a89b8660110dc03321fadbef45f.zip
Merge commit 'v2.6.38-rc8' into perf/core
Merge reason: Merge latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/pgtable.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 31b6188df221..b4bfe338ea0e 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -4,6 +4,8 @@
#ifndef __ASSEMBLY__
#ifdef CONFIG_MMU
+#include <linux/mm_types.h>
+
#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
extern int ptep_set_access_flags(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep,