patch-2.3.16 linux/arch/mips/dec/prom/memory.c

Next file: linux/arch/mips/dec/promcon.c
Previous file: linux/arch/mips/dec/prom/init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/arch/mips/dec/prom/memory.c linux/arch/mips/dec/prom/memory.c
@@ -34,7 +34,7 @@
 
 #define CHUNK_SIZE 0x400000
 
-__initfunc(unsigned long pmax_get_memory_size(void))
+unsigned long __init pmax_get_memory_size(void)
 {
 	volatile unsigned char *memory_page, dummy;
 	char	old_handler[0x80];
@@ -62,7 +62,7 @@
  * Use the REX prom calls to get hold of the memory bitmap, and thence
  * determine memory size.
  */
-__initfunc(unsigned long rex_get_memory_size(void))
+unsigned long __init rex_get_memory_size(void)
 {
 	int i, bitmap_size;
 	unsigned long mem_size = 0;
@@ -81,7 +81,7 @@
 	return (mem_size);
 }
 
-__initfunc(void prom_meminit(unsigned int magic))
+void __init prom_meminit(unsigned int magic)
 {
 	if (magic != REX_PROM_MAGIC)
 		mips_memory_upper = KSEG0 + pmax_get_memory_size();
@@ -94,7 +94,7 @@
 }
 
 /* Called from mem_init() to fixup the mem_map page settings. */
-__initfunc(void prom_fixup_mem_map(unsigned long start, unsigned long end))
+void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
 {
 }
 

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