git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
m68k
/
mm
/
kmap.c
diff --git
a/arch/m68k/mm/kmap.c
b/arch/m68k/mm/kmap.c
index
f46f049
..
85ad19a
100644
(file)
--- a/
arch/m68k/mm/kmap.c
+++ b/
arch/m68k/mm/kmap.c
@@
-7,6
+7,7
@@
* used by other architectures /Roman Zippel
*/
* used by other architectures /Roman Zippel
*/
+#include <linux/config.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@
-258,15
+259,13
@@
void __iounmap(void *addr, unsigned long size)
if (CPU_IS_020_OR_030) {
int pmd_off = (virtaddr/PTRTREESIZE) & 15;
if (CPU_IS_020_OR_030) {
int pmd_off = (virtaddr/PTRTREESIZE) & 15;
- int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
- if (
pmd_type
== _PAGE_PRESENT) {
+ if (
(pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK)
== _PAGE_PRESENT) {
pmd_dir->pmd[pmd_off] = 0;
virtaddr += PTRTREESIZE;
size -= PTRTREESIZE;
continue;
pmd_dir->pmd[pmd_off] = 0;
virtaddr += PTRTREESIZE;
size -= PTRTREESIZE;
continue;
- } else if (pmd_type == 0)
- continue;
+ }
}
if (pmd_bad(*pmd_dir)) {
}
if (pmd_bad(*pmd_dir)) {