projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
arch
/
mips
/
include
/
asm
/
pgtable.h
diff --git
a/arch/mips/include/asm/pgtable.h
b/arch/mips/include/asm/pgtable.h
index
e07a105
..
a6b611f
100644
(file)
--- a/
arch/mips/include/asm/pgtable.h
+++ b/
arch/mips/include/asm/pgtable.h
@@
-533,6
+533,7
@@
static inline int io_remap_pfn_range(struct vm_area_struct *vma,
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+#define has_transparent_hugepage has_transparent_hugepage
extern int has_transparent_hugepage(void);
static inline int pmd_trans_huge(pmd_t pmd)