patch-2.3.16 linux/arch/m68k/mm/init.c

Next file: linux/arch/m68k/mm/memory.c
Previous file: linux/arch/m68k/mac/mackeyb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/arch/m68k/mm/init.c linux/arch/m68k/mm/init.c
@@ -120,7 +120,7 @@
 unsigned long mm_cachebits = 0;
 #endif
 
-__initfunc(static pte_t * kernel_page_table(unsigned long *memavailp))
+static pte_t * __init kernel_page_table(unsigned long *memavailp)
 {
 	pte_t *ptablep;
 
@@ -138,7 +138,7 @@
 static pmd_t *last_pgtable __initdata = NULL;
 static pmd_t *zero_pgtable __initdata = NULL;
 
-__initfunc(static pmd_t * kernel_ptr_table(unsigned long *memavailp))
+static pmd_t * __init kernel_ptr_table(unsigned long *memavailp)
 {
 	if (!last_pgtable) {
 		unsigned long pmd, last;
@@ -177,8 +177,8 @@
 	return last_pgtable;
 }
 
-__initfunc(static unsigned long
-map_chunk (unsigned long addr, long size, unsigned long *memavailp))
+static unsigned long __init
+map_chunk (unsigned long addr, long size, unsigned long *memavailp)
 {
 #define PTRTREESIZE (256*1024)
 #define ROOTTREESIZE (32*1024*1024)
@@ -285,8 +285,8 @@
  * paging_init() continues the virtual memory environment setup which
  * was begun by the code in arch/head.S.
  */
-__initfunc(unsigned long paging_init(unsigned long start_mem,
-				     unsigned long end_mem))
+unsigned long __init paging_init(unsigned long start_mem,
+				     unsigned long end_mem)
 {
 	int chunk;
 	unsigned long mem_avail = 0;
@@ -363,7 +363,7 @@
 	return PAGE_ALIGN(free_area_init(start_mem, end_mem));
 }
 
-__initfunc(void mem_init(unsigned long start_mem, unsigned long end_mem))
+void __init mem_init(unsigned long start_mem, unsigned long end_mem)
 {
 	int codepages = 0;
 	int datapages = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)