From owner-p4-projects@FreeBSD.ORG Tue Apr 8 11:38:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8617537B404; Tue, 8 Apr 2003 11:38:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25C1037B401 for ; Tue, 8 Apr 2003 11:38:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A403043F75 for ; Tue, 8 Apr 2003 11:37:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h38Ibx0U071607 for ; Tue, 8 Apr 2003 11:37:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h38IbxFs071604 for perforce@freebsd.org; Tue, 8 Apr 2003 11:37:59 -0700 (PDT) Date: Tue, 8 Apr 2003 11:37:59 -0700 (PDT) Message-Id: <200304081837.h38IbxFs071604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 28535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2003 18:38:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=28535 Change 28535 by peter@peter_daintree on 2003/04/08 11:37:23 deal with "elf32 kernel" and "elf64 kernel" if necessary Affected files ... .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#3 edit .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#4 edit .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#9 edit .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#12 edit Differences ... ==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#3 (text+ko) ==== @@ -294,7 +294,9 @@ addr = roundup(addr, PAGE_SIZE); kernend = 0; - kfp = file_findfile(NULL, "elf kernel"); + kfp = file_findfile(NULL, "elf32 kernel"); + if (kfp == NULL) + kfp = file_findfile(NULL, "elf kernel"); if (kfp == NULL) panic("can't find kernel file"); file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); ==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -296,7 +296,9 @@ addr = roundup(addr, PAGE_SIZE); kernend = 0; - kfp = file_findfile(NULL, "elf kernel"); + kfp = file_findfile(NULL, "elf64 kernel"); + if (kfp == NULL) + kfp = file_findfile(NULL, "elf kernel"); if (kfp == NULL) panic("can't find kernel file"); file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); ==== //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#9 (text+ko) ==== @@ -267,7 +267,9 @@ */ if (mdp != NULL) { preload_metadata = mdp; - kmdp = preload_search_by_type("elf kernel"); + kmdp = preload_search_by_type("elf32 kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#12 (text+ko) ==== @@ -234,7 +234,9 @@ */ if (mdp != NULL) { preload_metadata = mdp; - kmdp = preload_search_by_type("elf kernel"); + kmdp = preload_search_by_type("elf64 kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);