--- zzzz-none-000/linux-2.4.17/arch/mips/mm/init.c 2001-07-04 18:50:39.000000000 +0000 +++ sangam-fb-322/linux-2.4.17/arch/mips/mm/init.c 2004-11-29 13:39:40.000000000 +0000 @@ -45,7 +45,11 @@ mmu_gather_t mmu_gathers[NR_CPUS]; +#if defined (CONFIG_MIPS_AVALANCHE_PAGING) +/* nothing */ +#else static unsigned long totalram_pages; +#endif /* CONFIG_MIPS_AVALANCHE_PAGING */ extern void prom_free_prom_memory(void); @@ -145,6 +149,14 @@ extern char _ftext, _etext, _fdata, _edata; extern char __init_begin, __init_end; +/*------------------------------------------------------------------------------------------*\ + * noetig fuer GDB via BDI2000 +\*------------------------------------------------------------------------------------------*/ +void *swapper_pg_dir_pointer = &swapper_pg_dir; + +#if defined(CONFIG_MIPS_AVALANCHE_PAGING) + /* nothing */ +#else /* !CONFIG_MIPS_AVALANCHE_PAGING */ void __init paging_init(void) { unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; @@ -170,6 +182,9 @@ free_area_init(zones_size); } +#endif /* CONFIG_MIPS_AVALANCHE_PAGING */ + + #define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT) #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) @@ -196,6 +211,9 @@ return 0; } +#if defined(CONFIG_MIPS_AVALANCHE_PAGING) + /* nothing */ +#else void __init mem_init(void) { unsigned long codesize, reservedpages, datasize, initsize; @@ -228,6 +246,7 @@ datasize >> 10, initsize >> 10); } +#endif /* CONFIG_MIPS_AVALANCHE_PAGING */ #ifdef CONFIG_BLK_DEV_INITRD void free_initrd_mem(unsigned long start, unsigned long end) @@ -245,6 +264,9 @@ } #endif +#if defined (CONFIG_MIPS_AVALANCHE_PAGING) +/* nothing */ +#else extern char __init_begin, __init_end; extern void prom_free_prom_memory(void); @@ -252,7 +274,6 @@ { unsigned long addr; - prom_free_prom_memory (); addr = (unsigned long) &__init_begin; while (addr < (unsigned long) &__init_end) { @@ -269,7 +290,7 @@ void si_meminfo(struct sysinfo *val) { val->totalram = totalram_pages; - val->sharedram = atomic_read(&shmem_nrpages); + val->sharedram = 0; val->freeram = nr_free_pages(); val->bufferram = atomic_read(&buffermem_pages); val->totalhigh = 0; @@ -278,3 +299,4 @@ return; } +#endif /* CONFIG_MIPS_AVALANCHE_PAGING */