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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
motorola_pgtable.h
diff --git
a/arch/m68k/include/asm/motorola_pgtable.h
b/arch/m68k/include/asm/motorola_pgtable.h
index
8e9a8a7
..
45bd3f5
100644
(file)
--- a/
arch/m68k/include/asm/motorola_pgtable.h
+++ b/
arch/m68k/include/asm/motorola_pgtable.h
@@
-221,9
+221,7
@@
static inline pte_t *pte_offset_kernel(pmd_t *pmdp, unsigned long address)
}
#define pte_offset_map(pmdp,address) ((pte_t *)__pmd_page(*pmdp) + (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
}
#define pte_offset_map(pmdp,address) ((pte_t *)__pmd_page(*pmdp) + (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
-#define pte_offset_map_nested(pmdp, address) pte_offset_map(pmdp, address)
#define pte_unmap(pte) ((void)0)
#define pte_unmap(pte) ((void)0)
-#define pte_unmap_nested(pte) ((void)0)
/*
* Allocate and free page tables. The xxx_kernel() versions are
/*
* Allocate and free page tables. The xxx_kernel() versions are