patch-2.3.16 linux/arch/sparc/ap1000/apmmu.c

• Lines: 99
• Date: Tue Aug 31 11:23:29 1999
• Orig file: v2.3.15/linux/arch/sparc/ap1000/apmmu.c
• Orig date: Fri Jul 23 12:20:23 1999

diff -u --recursive --new-file v2.3.15/linux/arch/sparc/ap1000/apmmu.c linux/arch/sparc/ap1000/apmmu.c
@@ -527,7 +527,7 @@
 {
 	printk("Kernel faults at addr=0x%08lx\n", address);
 	printk("PTE=%08lx\n", apmmu_hwprobe((address & PAGE_MASK)));
-	die_if_kernel("APMMU bolixed...", current->tss.kregs);
+	die_if_kernel("APMMU bolixed...", current->thread.kregs);
 }
 
 static inline void alloc_context(struct task_struct *tsk)
@@ -775,7 +775,7 @@
 	return (pte_t *) apmmu_early_pmd_page(*dir) + ((address >> PAGE_SHIFT) & (APMMU_PTRS_PER_PTE - 1));
 }
 
-__initfunc(static inline void apmmu_allocate_ptable_skeleton(unsigned long start, unsigned long end))
+static inline void __init apmmu_allocate_ptable_skeleton(unsigned long start, unsigned long end)
 {
 	pgd_t *pgdp;
 	pmd_t *pmdp;
@@ -797,7 +797,7 @@
 }
 
 
-__initfunc(static void make_page(unsigned virt_page, unsigned phys_page, unsigned prot))
+static void __init make_page(unsigned virt_page, unsigned phys_page, unsigned prot)
 {
 	pgd_t *pgdp;
 	pmd_t *pmdp;
@@ -819,7 +819,7 @@
 }
 
 
-__initfunc(static void make_large_page(unsigned virt_page, unsigned phys_page, unsigned prot))
+static void __init make_large_page(unsigned virt_page, unsigned phys_page, unsigned prot)
 {
 	pgd_t *pgdp;
 	unsigned start = virt_page<<12;
@@ -829,7 +829,7 @@
 }
 
 
-__initfunc(static void ap_setup_mappings(void))
+static void __init ap_setup_mappings(void)
 {
 	unsigned Srwe = APMMU_PRIV | APMMU_VALID;
 	unsigned SrweUr = 0x14 | APMMU_VALID; /* weird! */
@@ -897,7 +897,7 @@
 	make_page(MSC_REMREPLY_DIRECT_END>>PAGE_SHIFT, 0xa0c004,Srwe);
 }
 
-__initfunc(static void map_kernel(void))
+static void __init map_kernel(void)
 {
 	int phys;
 
@@ -917,7 +917,7 @@
 extern int physmem_mapped_contig;
 extern int linux_num_cpus;
 
-__initfunc(unsigned long apmmu_paging_init(unsigned long start_mem, unsigned long end_mem))
+unsigned long __init apmmu_paging_init(unsigned long start_mem, unsigned long end_mem)
 {
 	int i;
 
@@ -979,7 +979,7 @@
 {
 }
 
-__initfunc(static void poke_viking(void))
+static void __init poke_viking(void)
 {
 	unsigned long mreg = apmmu_get_mmureg();
 
@@ -991,7 +991,7 @@
 	apmmu_set_mmureg(mreg);
 }
 
-__initfunc(static void init_viking(void))
+static void __init init_viking(void)
 {
 	apmmu_name = "TI Viking/AP1000";
 
@@ -1024,7 +1024,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;
 	
@@ -1038,7 +1038,7 @@
 }
 
 /* Load up routines and constants for apmmu */
-__initfunc(void ld_mmu_apmmu(void))
+void __init ld_mmu_apmmu(void)
 {
 	/* First the constants */
 	BTFIXUPSET_SIMM13(pmd_shift, APMMU_PMD_SHIFT);