patch-2.2.0-pre9 linux/arch/m68k/kernel/setup.c

• Lines: 37
• Date: Tue Jan 19 10:58:34 1999
• Orig file: v2.2.0-pre8/linux/arch/m68k/kernel/setup.c
• Orig date: Sat Sep 5 16:46:40 1998

diff -u --recursive --new-file v2.2.0-pre8/linux/arch/m68k/kernel/setup.c linux/arch/m68k/kernel/setup.c
@@ -48,6 +48,7 @@
 extern unsigned long availmem;
 
 int m68k_num_memory = 0;
+int m68k_realnum_memory = 0;
 struct mem_info m68k_memory[NUM_MEMINFO];
 
 static struct mem_info m68k_ramdisk = { 0, 0 };
@@ -62,8 +63,6 @@
 int (*mach_keyb_init) (void) __initdata;
 int (*mach_kbdrate) (struct kbd_repeat *) = NULL;
 void (*mach_kbd_leds) (unsigned int) = NULL;
-/* machine dependent "kbd-reset" setup function */
-void (*kbd_reset_setup) (char *, int) __initdata = NULL;
 /* machine dependent irq functions */
 void (*mach_init_IRQ) (void) __initdata;
 void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
@@ -159,6 +158,7 @@
 	record = (struct bi_record *)((u_long)record+record->size);
     }
 
+    m68k_realnum_memory = m68k_num_memory;
 #ifdef CONFIG_SINGLE_MEMORY_CHUNK
     if (m68k_num_memory > 1) {
 	printk("Ignoring last %i chunks of physical memory\n",
@@ -398,9 +398,9 @@
 }
 #endif
 
-__initfunc(unsigned long arch_kbd_init(void))
+/* for "kbd-reset" cmdline param */
+void __init kbd_reset_setup(char *str, int *ints)
 {
-	return mach_keyb_init();
 }
 
 void arch_gettod(int *year, int *mon, int *day, int *hour,