Module Name:    src
Committed By:   snj
Date:           Tue Dec 31 01:17:02 UTC 2024

Modified Files:
        src/sys/arch/ofppc/ofppc [netbsd-10]: machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1030):
        sys/arch/ofppc/ofppc/machdep.c: 1.121
PR 58909: call model_init() always, even if we could not fetch a "model"
or "name" property.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.119.18.1 src/sys/arch/ofppc/ofppc/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.119 src/sys/arch/ofppc/ofppc/machdep.c:1.119.18.1
--- src/sys/arch/ofppc/ofppc/machdep.c:1.119	Fri Mar  5 01:33:33 2021
+++ src/sys/arch/ofppc/ofppc/machdep.c	Tue Dec 31 01:17:02 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.119 2021/03/05 01:33:33 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.119.18.1 2024/12/31 01:17:02 snj Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2021/03/05 01:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119.18.1 2024/12/31 01:17:02 snj Exp $");
 
 #include "opt_ofwoea.h"
 
@@ -136,9 +136,9 @@ initppc(u_int startkernel, u_int endkern
 		if (i == -1) {
 			OF_getprop(node, "name", model_name,
 			    sizeof(model_name));
-			model_init();
 		}
 	}
+	model_init();
 
 	if ((oeacpufeat & OEACPU_NOBAT) == 0) {
 		node = OF_finddevice("/");

Reply via email to