From owner-p4-projects@FreeBSD.ORG  Mon Dec  4 16:41:42 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F75E16A47E; Mon,  4 Dec 2006 16:41:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 60E3B16A47C
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 16:41:42 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2823543D66
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 16:35:06 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4GZZmM058749
	for <perforce@freebsd.org>; Mon, 4 Dec 2006 16:35:35 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4GZZWt058746
	for perforce@freebsd.org; Mon, 4 Dec 2006 16:35:35 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 4 Dec 2006 16:35:35 GMT
Message-Id: <200612041635.kB4GZZWt058746@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111019 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2006 16:41:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=111019

Change 111019 by millert@millert_g5tower on 2006/12/04 16:35:12

	Revert to vendor versions.  Changes were from Panther and
	are not needed any longer.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/ppc_init.c#3 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/pexpert/pexpert/ppc/boot.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ppc/ppc_init.c#3 (text+ko) ====

@@ -30,12 +30,6 @@
 /*
  * @OSF_COPYRIGHT@
  */
-/*
- * NOTICE: This file was modified by McAfee Research in 2004 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
 
 #include <debug.h>
 #include <mach_ldebug.h>
@@ -144,30 +138,6 @@
 void	ppc_init_cpu(
 			struct per_proc_info *proc_info);
 
-static int    *boot_exdata = 0;
-static size_t  boot_exdatalen = 0;
-
-int preload_find_data (const char *name, size_t *size, void **ptr)
-{
-  size_t  rlen = boot_exdatalen;
-  int    *exp = boot_exdata;
-
-  while (rlen > 0) {
-    size_t esize = (exp[0] + sizeof (int) * 5 + 0xfff) & ~0xfff;
-    if (strcmp ((char *) (exp + 1), name)) {
-      rlen -= esize;
-      exp = (int *) (((char*)exp) + esize);
-    }
-    else {
-      *size = exp[0];
-      *ptr = exp + 5;
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
 /*
  *		Routine:		ppc_init
  *		Function:
@@ -309,10 +279,7 @@
 			}
 		}
 	}
-
-	boot_exdata = args->exdata;
-	boot_exdatalen = args->exdatalen;
-
+		
 	machine_startup(args);
 }
 

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/pexpert/pexpert/ppc/boot.h#3 (text+ko) ====

@@ -30,12 +30,6 @@
 /*
  * @OSF_COPYRIGHT@
  */
-/*
- * NOTICE: This file was modified by McAfee Research in 2004 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
 
 #ifndef _PEXPERT_PPC_BOOT_H_
 #define _PEXPERT_PPC_BOOT_H_
@@ -71,7 +65,7 @@
 
 /* Boot argument structure - passed into Mach kernel at boot time.
  */
-#define kBootArgsRevision		2
+#define kBootArgsRevision		1
 #define kBootArgsVersion1		1
 #define kBootArgsVersion2		2
 
@@ -85,8 +79,6 @@
     void		*deviceTreeP;	/* Base of flattened device tree */
     unsigned long	deviceTreeLength;/* Length of flattened tree */
     unsigned long	topOfKernelData;/* Highest address used in kernel data area */
-  void                  *exdata;
-  unsigned long         exdatalen;
 } boot_args;
 
 extern boot_args passed_args;