patch-2.2.18 linux/arch/sparc64/kernel/setup.c

• Lines: 24
• Date: Sat Oct 14 00:28:12 2000
• Orig file: v2.2.17/arch/sparc64/kernel/setup.c
• Orig date: Fri Apr 21 12:45:48 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/arch/sparc64/kernel/setup.c linux/arch/sparc64/kernel/setup.c
@@ -1,4 +1,4 @@
-/*  $Id: setup.c,v 1.43.2.3 2000/03/03 23:50:37 davem Exp $
+/*  $Id: setup.c,v 1.43.2.5 2000/10/02 02:05:37 anton Exp $
  *  linux/arch/sparc64/kernel/setup.c
  *
  *  Copyright (C) 1995,1996  David S. Miller (davem@caip.rutgers.edu)
@@ -550,7 +550,7 @@
 	init_task.tss.kregs = &fake_swapper_regs;
 
 #ifdef CONFIG_IP_PNP
-	if (!ic_set_manually) {
+	if (ic_myaddr == INADDR_NONE) {
 		int chosen = prom_finddevice ("/chosen");
 		u32 cl, sv, gw;
 		
@@ -642,7 +642,7 @@
             prom_rev, prom_prev >> 16, (prom_prev >> 8) & 0xff, prom_prev & 0xff,
 	    linux_num_cpus, smp_num_cpus
 #ifndef __SMP__
-            , loops_per_sec/500000, (loops_per_sec/5000) % 100
+            , loops_per_jiffy/(500000/HZ), (loops_per_jiffy/(5000/HZ)) % 100
 #endif
 	    );
 #ifdef __SMP__