diff options
author | 2013-11-06 06:39:45 +0100 | |
---|---|---|
committer | 2013-11-06 06:39:45 +0100 | |
commit | 97c53b402fcadb50201c23914f614bf8430d9c20 (patch) | |
tree | 3c9b94e866d150c3a2d8ac853e388c38fade8b45 /arch/score/include/asm/pgalloc.h | |
parent | hung_task debugging: Add tracepoint to report the hang (diff) | |
parent | Linux 3.12 (diff) | |
download | wireguard-linux-97c53b402fcadb50201c23914f614bf8430d9c20.tar.xz wireguard-linux-97c53b402fcadb50201c23914f614bf8430d9c20.zip |
Merge tag 'v3.12' into core/locking to pick up mutex upates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/score/include/asm/pgalloc.h')
-rw-r--r-- | arch/score/include/asm/pgalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h index 059a61b7071b..716b3fd1d863 100644 --- a/arch/score/include/asm/pgalloc.h +++ b/arch/score/include/asm/pgalloc.h @@ -2,7 +2,7 @@ #define _ASM_SCORE_PGALLOC_H #include <linux/mm.h> - +#include <linux/highmem.h> static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) { |