X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fm68k%2Fmm%2Fmemory.c;h=d9616bebb9738248d702132355c22bfad8985d6a;hb=f9296eb00ed30209424102d3c920e69617eea853;hp=09985ae7fd32597c343382b55d23d976335c4fd4;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index 09985ae7f..d9616bebb 100644 --- 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); - set_page_count(PD_PAGE(dp), 1); + atomic_set(&PD_PAGE(dp)->count, 1); return; } @@ -129,7 +129,7 @@ int free_pointer_table (pmd_t *ptable) return 0; } -#ifdef DEBUG_INVALID_PTOV +#if DEBUG_INVALID_PTOV 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); -#ifdef DEBUG_INVALID_PTOV +#if DEBUG_INVALID_PTOV if (mm_inv_cnt > 0) { mm_inv_cnt--; printk("Invalid use of phys_to_virt(0x%lx) at 0x%p!\n",