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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
m68k
/
mm
/
memory.c
diff --git
a/arch/m68k/mm/memory.c
b/arch/m68k/mm/memory.c
index
4af1523
..
1453a60
100644
(file)
--- a/
arch/m68k/mm/memory.c
+++ b/
arch/m68k/mm/memory.c
@@
-54,7
+54,7
@@
void __init init_pointer_table(unsigned long ptable)
/* unreserve the page so it's possible to free that page */
PD_PAGE(dp)->flags &= ~(1 << PG_reserved);
/* unreserve the page so it's possible to free that page */
PD_PAGE(dp)->flags &= ~(1 << PG_reserved);
-
atomic_set(&PD_PAGE(dp)->count
, 1);
+
set_page_count(PD_PAGE(dp)
, 1);
return;
}
return;
}
@@
-77,7
+77,7
@@
pmd_t *get_pointer_table (void)
ptable_desc *new;
if (!(page = (void *)get_zeroed_page(GFP_KERNEL)))
ptable_desc *new;
if (!(page = (void *)get_zeroed_page(GFP_KERNEL)))
- return
0
;
+ return
NULL
;
flush_tlb_kernel_page(page);
nocache_page(page);
flush_tlb_kernel_page(page);
nocache_page(page);
@@
-129,7
+129,7
@@
int free_pointer_table (pmd_t *ptable)
return 0;
}
return 0;
}
-#if DEBUG_INVALID_PTOV
+#if
def
DEBUG_INVALID_PTOV
int mm_inv_cnt = 5;
#endif
int mm_inv_cnt = 5;
#endif
@@
-179,7
+179,7
@@
unsigned long mm_ptov (unsigned long paddr)
voff += m68k_memory[i].size;
} while (++i < m68k_num_memory);
voff += m68k_memory[i].size;
} while (++i < m68k_num_memory);
-#if DEBUG_INVALID_PTOV
+#if
def
DEBUG_INVALID_PTOV
if (mm_inv_cnt > 0) {
mm_inv_cnt--;
printk("Invalid use of phys_to_virt(0x%lx) at 0x%p!\n",
if (mm_inv_cnt > 0) {
mm_inv_cnt--;
printk("Invalid use of phys_to_virt(0x%lx) at 0x%p!\n",
@@
-298,7
+298,7
@@
void cache_clear (unsigned long paddr, int len)
: "d0");
#ifdef CONFIG_M68K_L2_CACHE
if(mach_l2_flush)
: "d0");
#ifdef CONFIG_M68K_L2_CACHE
if(mach_l2_flush)
- mach_l2_flush(0);
+ mach_l2_flush(0);
#endif
}
#endif
}
@@
-350,7
+350,7
@@
void cache_push (unsigned long paddr, int len)
: "d0");
#ifdef CONFIG_M68K_L2_CACHE
if(mach_l2_flush)
: "d0");
#ifdef CONFIG_M68K_L2_CACHE
if(mach_l2_flush)
- mach_l2_flush(1);
+ mach_l2_flush(1);
#endif
}
#endif
}
@@
-387,7
+387,7
@@
static unsigned long virt_to_phys_slow(unsigned long vaddr)
unsigned long mmusr;
set_fs(get_ds());
unsigned long mmusr;
set_fs(get_ds());
-
+
asm volatile (".chip 68040\n\t"
"ptestr (%1)\n\t"
"movec %%mmusr, %0\n\t"
asm volatile (".chip 68040\n\t"
"ptestr (%1)\n\t"
"movec %%mmusr, %0\n\t"