patch-2.3.99-pre7 linux/arch/ppc/kernel/pmac_setup.c

• Lines: 39
• Date: Tue May 2 13:05:40 2000
• Orig file: v2.3.99-pre6/linux/arch/ppc/kernel/pmac_setup.c
• Orig date: Tue Mar 7 14:32:25 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -100,6 +100,8 @@
 
 extern char saved_command_line[];
 
+extern int pmac_newworld;
+
 #define DEFAULT_ROOT_DEVICE 0x0801	/* sda1 - slightly silly choice */
 
 extern void zs_kgdb_hook(int tty_num);
@@ -198,6 +200,11 @@
 		}
 	}
 	
+	/* Indicate newworld/oldworld */
+	len += sprintf(buffer+len, "pmac-generation\t: %s\n",
+		pmac_newworld ? "NewWorld" : "OldWorld");		
+	
+
 	return len;
 }
 
@@ -499,6 +506,8 @@
 	struct adb_request req;
 #endif /* CONFIG_ADB_CUDA */
 
+	pmac_nvram_update();
+	
 	switch (sys_ctrler) {
 #ifdef CONFIG_ADB_CUDA
 	case SYS_CTRLER_CUDA:
@@ -524,6 +533,8 @@
 	struct adb_request req;
 #endif /* CONFIG_ADB_CUDA */
 
+	pmac_nvram_update();
+	
 	switch (sys_ctrler) {
 #ifdef CONFIG_ADB_CUDA
 	case SYS_CTRLER_CUDA: