git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'late/cleanup' into devel-late
[pandora-kernel.git]
/
mm
/
pgtable-generic.c
diff --git
a/mm/pgtable-generic.c
b/mm/pgtable-generic.c
index
5a74fea
..
74c0dda
100644
(file)
--- a/
mm/pgtable-generic.c
+++ b/
mm/pgtable-generic.c
@@
-109,8
+109,8
@@
pmd_t pmdp_clear_flush(struct vm_area_struct *vma, unsigned long address,
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-
pmd_t
pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
-
pmd_t *pmdp)
+
void
pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
+ pmd_t *pmdp)
{
pmd_t pmd = pmd_mksplitting(*pmdp);
VM_BUG_ON(address & ~HPAGE_PMD_MASK);
{
pmd_t pmd = pmd_mksplitting(*pmdp);
VM_BUG_ON(address & ~HPAGE_PMD_MASK);