From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:12:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E211037B404; Wed, 30 Apr 2003 21:12:31 -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 934BA37B401 for ; Wed, 30 Apr 2003 21:12:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F63043FAF for ; Wed, 30 Apr 2003 21:12:31 -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 h414CU0U009112 for ; Wed, 30 Apr 2003 21:12:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414CU2w009109 for perforce@freebsd.org; Wed, 30 Apr 2003 21:12:30 -0700 (PDT) Date: Wed, 30 Apr 2003 21:12:30 -0700 (PDT) Message-Id: <200305010412.h414CU2w009109@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 30262 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: Thu, 01 May 2003 04:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30262 Change 30262 by peter@peter_daintree on 2003/04/30 21:12:04 revert to vendor Affected files ... .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#6 edit .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#7 edit Differences ... ==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#6 (text+ko) ==== @@ -302,10 +302,6 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); - /* Compatability with older kernels */ - file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); - file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); - file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); *modulep = addr; size = md_copymodules(0); @@ -313,8 +309,6 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); - md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ - bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr); ==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#7 (text+ko) ==== @@ -304,10 +304,6 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); - /* The next three are for compatability with older kernels */ - file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); - file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); - file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slot, &dtlb_slot); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slot, &itlb_slot); file_addmetadata(kfp, MODINFOMD_DTLB, @@ -321,8 +317,6 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); - md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ - bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr);