patch-2.3.16 linux/arch/sparc/mm/srmmu.c

• Lines: 237
• Date: Tue Aug 31 11:23:30 1999
• Orig file: v2.3.15/linux/arch/sparc/mm/srmmu.c
• Orig date: Mon Aug 9 11:29:37 1999

diff -u --recursive --new-file v2.3.15/linux/arch/sparc/mm/srmmu.c linux/arch/sparc/mm/srmmu.c
@@ -1,4 +1,4 @@
-/* $Id: srmmu.c,v 1.190 1999/08/07 17:47:01 anton Exp $
+/* $Id: srmmu.c,v 1.191 1999/08/31 06:54:38 davem Exp $
  * srmmu.c:  SRMMU specific routines for memory management.
  *
  * Copyright (C) 1995 David S. Miller  (davem@caip.rutgers.edu)
@@ -204,7 +204,7 @@
 #define PGSKIP_DEBUG(from,to) do { } while (0)
 #endif
 
-__initfunc(void srmmu_frob_mem_map(unsigned long start_mem))
+void __init srmmu_frob_mem_map(unsigned long start_mem)
 {
 	unsigned long bank_start, bank_end = 0;
 	unsigned long addr;
@@ -1503,7 +1503,7 @@
  * looking at the prom's page table directly which is what most
  * other OS's do.  Yuck... this is much better.
  */
-__initfunc(void srmmu_inherit_prom_mappings(unsigned long start,unsigned long end))
+void __init srmmu_inherit_prom_mappings(unsigned long start,unsigned long end)
 {
 	pgd_t *pgdp;
 	pmd_t *pmdp;
@@ -1571,7 +1571,7 @@
 static int srmmu_low_pa __initdata = 0;
 static unsigned long end_of_phys_memory __initdata = 0;
 
-__initfunc(void srmmu_end_memory(unsigned long memory_size, unsigned long *end_mem_p))
+void __init srmmu_end_memory(unsigned long memory_size, unsigned long *end_mem_p)
 {
 	unsigned int sum = 0;
 	unsigned long last = 0xff000000;
@@ -1633,7 +1633,7 @@
 #define KERNEL_PTE(page_shifted) ((page_shifted)|SRMMU_CACHE|SRMMU_PRIV|SRMMU_VALID)
 
 /* Create a third-level SRMMU 16MB page mapping. */
-__initfunc(static void do_large_mapping(unsigned long vaddr, unsigned long phys_base))
+static void __init do_large_mapping(unsigned long vaddr, unsigned long phys_base)
 {
 	pgd_t *pgdp = srmmu_pgd_offset(&init_mm, vaddr);
 	unsigned long big_pte;
@@ -1664,7 +1664,7 @@
  * array of char's, each member indicating if that spbank is mapped
  * yet or not.
  */
-__initfunc(static int find_free_spbank(char *taken_vector))
+static int __init find_free_spbank(char *taken_vector)
 {
 	int entry;
 
@@ -1678,7 +1678,7 @@
 
 /* Map sp_bank entry SP_ENTRY, starting at virtual address VBASE.
  */
-__initfunc(static unsigned long map_spbank(unsigned long vbase, int sp_entry))
+static unsigned long __init map_spbank(unsigned long vbase, int sp_entry)
 {
 	unsigned long pstart = (sp_banks[sp_entry].base_addr & SRMMU_PGDIR_MASK);
 	unsigned long vstart = (vbase & SRMMU_PGDIR_MASK);
@@ -1943,7 +1943,7 @@
 
 void (*poke_srmmu)(void) __initdata = NULL;
 
-__initfunc(unsigned long srmmu_paging_init(unsigned long start_mem, unsigned long end_mem))
+unsigned long __init srmmu_paging_init(unsigned long start_mem, unsigned long end_mem)
 {
 	unsigned long ptables_start;
 	int i, cpunode;
@@ -2157,13 +2157,13 @@
 }
 
 /* Init various srmmu chip types. */
-__initfunc(static void srmmu_is_bad(void))
+static void __init srmmu_is_bad(void)
 {
 	prom_printf("Could not determine SRMMU chip type.\n");
 	prom_halt();
 }
 
-__initfunc(static void init_vac_layout(void))
+static void __init init_vac_layout(void)
 {
 	int nd, cache_lines;
 	char node_str[128];
@@ -2217,7 +2217,7 @@
 	       (int)vac_cache_size, (int)vac_line_size);
 }
 
-__initfunc(static void poke_hypersparc(void))
+static void __init poke_hypersparc(void)
 {
 	volatile unsigned long clear;
 	unsigned long mreg = srmmu_get_mmureg();
@@ -2240,7 +2240,7 @@
 	clear = srmmu_get_fstatus();
 }
 
-__initfunc(static void init_hypersparc(void))
+static void __init init_hypersparc(void)
 {
 	srmmu_name = "ROSS HyperSparc";
 
@@ -2277,7 +2277,7 @@
 	hypersparc_setup_blockops();
 }
 
-__initfunc(static void poke_cypress(void))
+static void __init poke_cypress(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 	unsigned long faddr, tagval;
@@ -2316,7 +2316,7 @@
 	srmmu_set_mmureg(mreg);
 }
 
-__initfunc(static void init_cypress_common(void))
+static void __init init_cypress_common(void)
 {
 	init_vac_layout();
 
@@ -2345,14 +2345,14 @@
 	poke_srmmu = poke_cypress;
 }
 
-__initfunc(static void init_cypress_604(void))
+static void __init init_cypress_604(void)
 {
 	srmmu_name = "ROSS Cypress-604(UP)";
 	srmmu_modtype = Cypress;
 	init_cypress_common();
 }
 
-__initfunc(static void init_cypress_605(unsigned long mrev))
+static void __init init_cypress_605(unsigned long mrev)
 {
 	srmmu_name = "ROSS Cypress-605(MP)";
 	if(mrev == 0xe) {
@@ -2369,7 +2369,7 @@
 	init_cypress_common();
 }
 
-__initfunc(static void poke_swift(void))
+static void __init poke_swift(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 
@@ -2390,7 +2390,7 @@
 }
 
 #define SWIFT_MASKID_ADDR  0x10003018
-__initfunc(static void init_swift(void))
+static void __init init_swift(void)
 {
 	unsigned long swift_rev;
 
@@ -2552,7 +2552,7 @@
 }
 
 
-__initfunc(static void poke_turbosparc(void))
+static void __init poke_turbosparc(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 	unsigned long ccreg;
@@ -2592,7 +2592,7 @@
 	srmmu_set_mmureg(mreg);
 }
 
-__initfunc(static void init_turbosparc(void))
+static void __init init_turbosparc(void)
 {
 	srmmu_name = "Fujitsu TurboSparc";
 	srmmu_modtype = TurboSparc;
@@ -2616,7 +2616,7 @@
 	poke_srmmu = poke_turbosparc;
 }
 
-__initfunc(static void poke_tsunami(void))
+static void __init poke_tsunami(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 
@@ -2627,7 +2627,7 @@
 	srmmu_set_mmureg(mreg);
 }
 
-__initfunc(static void init_tsunami(void))
+static void __init init_tsunami(void)
 {
 	/* Tsunami's pretty sane, Sun and TI actually got it
 	 * somewhat right this time.  Fujitsu should have
@@ -2656,7 +2656,7 @@
 	poke_srmmu = poke_tsunami;
 }
 
-__initfunc(static void poke_viking(void))
+static void __init poke_viking(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 	static int smp_catch = 0;
@@ -2711,7 +2711,7 @@
 #endif
 }
 
-__initfunc(static void init_viking(void))
+static void __init init_viking(void)
 {
 	unsigned long mreg = srmmu_get_mmureg();
 
@@ -2776,7 +2776,7 @@
 }
 
 /* Probe for the srmmu chip version. */
-__initfunc(static void get_srmmu_type(void))
+static void __init get_srmmu_type(void)
 {
 	unsigned long mreg, psr;
 	unsigned long mod_typ, mod_rev, psr_typ, psr_vers;
@@ -2942,7 +2942,7 @@
 		*iaddr = SPARC_BRANCH((unsigned long) daddr, (unsigned long) iaddr); \
 	} while(0);
 
-__initfunc(static void patch_window_trap_handlers(void))
+static void __init patch_window_trap_handlers(void)
 {
 	unsigned long *iaddr, *daddr;
 	
@@ -2965,7 +2965,7 @@
 #endif
 
 /* Load up routines and constants for sun4m and sun4d mmu */
-__initfunc(void ld_mmu_srmmu(void))
+void __init ld_mmu_srmmu(void)
 {
 	extern void ld_mmu_iommu(void);
 	extern void ld_mmu_iounit(void);