patch-2.4.20 linux-2.4.20/arch/ppc64/mm/init.c
Next file: linux-2.4.20/arch/ppc64/xmon/privinst.h
Previous file: linux-2.4.20/arch/ppc64/mm/fault.c
Back to the patch index
Back to the overall index
- Lines: 120
- Date:
Thu Nov 28 15:53:11 2002
- Orig file:
linux-2.4.19/arch/ppc64/mm/init.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/ppc64/mm/init.c linux-2.4.20/arch/ppc64/mm/init.c
@@ -1,6 +1,4 @@
/*
- *
- *
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
*
@@ -214,7 +212,7 @@
else {
ea = ioremap_bot;
ioremap_bot += size;
- }
+ }
if ((flags & _PAGE_PRESENT) == 0)
flags |= pgprot_val(PAGE_KERNEL);
@@ -231,9 +229,9 @@
void iounmap(void *addr)
{
#ifdef CONFIG_PPC_ISERIES
- /* iSeries I/O Remap is a noop */
+ /* iSeries I/O Remap is a noop */
return;
-#else
+#else
/* DRENG / PPPBBB todo */
return;
#endif
@@ -264,7 +262,7 @@
/* If the mm subsystem is not fully up, we cannot create a
* linux page table entry for this mapping. Simply bolt an
* entry in the hardware page table.
- */
+ */
vsid = get_kernel_vsid(ea);
make_pte(htab_data.htab,
(vsid << 28) | (ea & 0xFFFFFFF), // va (NOT the ea)
@@ -434,12 +432,11 @@
}
#endif
-
-
/*
* Do very early mm setup.
*/
-void __init mm_init_ppc64(void) {
+void __init mm_init_ppc64(void)
+{
struct paca_struct *lpaca;
unsigned long guard_page, index;
@@ -467,8 +464,6 @@
ppc_md.progress("MM:exit", 0x211);
}
-
-
/*
* Initialize the bootmem system and give it all the memory we
* have available.
@@ -488,7 +483,7 @@
bootmap_pages = bootmem_bootmap_pages(total_pages);
start = (unsigned long)__a2p(lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE));
- if( start == 0 ) {
+ if (start == 0) {
udbg_printf("do_init_bootmem: failed to allocate a bitmap.\n");
udbg_printf("\tbootmap_pages = 0x%lx.\n", bootmap_pages);
PPCDBG_ENTER_DEBUGGER();
@@ -502,7 +497,7 @@
PPCDBG(PPCDBG_MMINIT, "\tboot_mapsize = 0x%lx\n", boot_mapsize);
/* add all physical memory to the bootmem map */
- for (i=0; i < lmb.memory.cnt ;i++) {
+ for (i=0; i < lmb.memory.cnt; i++) {
unsigned long physbase, size;
unsigned long type = lmb.memory.region[i].type;
@@ -514,7 +509,7 @@
free_bootmem(physbase, size);
}
/* reserve the sections we're already using */
- for (i=0; i < lmb.reserved.cnt ;i++) {
+ for (i=0; i < lmb.reserved.cnt; i++) {
unsigned long physbase = lmb.reserved.region[i].physbase;
unsigned long size = lmb.reserved.region[i].size;
#if 0 /* PPPBBB */
@@ -538,19 +533,12 @@
/*
* All pages are DMA-able so we put them all in the DMA zone.
*/
- zones_size[0] = lmb_end_of_DRAM() >> PAGE_SHIFT;
+ zones_size[ZONE_DMA] = lmb_end_of_DRAM() >> PAGE_SHIFT;
for (i = 1; i < MAX_NR_ZONES; i++)
zones_size[i] = 0;
free_area_init(zones_size);
}
-extern unsigned long prof_shift;
-extern unsigned long prof_len;
-extern unsigned int * prof_buffer;
-extern unsigned long dprof_shift;
-extern unsigned long dprof_len;
-extern unsigned int * dprof_buffer;
-
void initialize_paca_hardware_interrupt_stack(void);
void __init mem_init(void)
@@ -609,10 +597,6 @@
#ifdef CONFIG_PPC_ISERIES
create_virtual_bus_tce_table();
- /* HACK HACK This allows the iSeries profiling to use /proc/profile */
- prof_shift = dprof_shift;
- prof_len = dprof_len;
- prof_buffer = dprof_buffer;
#endif
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)