--- Libc/Libc-391/mach/mach_init.c
+++ Libc/Libc-262/mach/mach_init.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -60,8 +59,6 @@
 __private_extern__ kern_return_t _host_mach_msg_trap_return_;
 
 vm_size_t	vm_page_size;
-vm_size_t	vm_page_mask;
-int		vm_page_shift;
 
 /*
  * Forward internal declarations for automatic mach_init during
@@ -73,11 +70,9 @@
 static void mach_atfork_child_routine(void);
 static boolean_t first = TRUE;
 static void (*previous_atfork_child_routine)(void);
-static boolean_t mach_init_inited = FALSE;
 extern int mach_init(void);
 extern void _pthread_set_self(void *);
 extern void cthread_set_self(void *);
-extern void other_libc_init(void);
 
 
 static void mach_atfork_child_routine(void)
@@ -94,7 +89,6 @@
 	if (previous_atfork_child_routine) {
 		(*previous_atfork_child_routine)();
 	}
-	mach_init_inited = FALSE;
 	mach_init();
 }
 
@@ -106,6 +100,7 @@
 
 int mach_init_doit(int forkchild)
 {
+	mach_msg_type_number_t host_info_size;
 	host_t host;
 
 	/*
@@ -142,25 +137,15 @@
 	 *	Cache some other valuable system constants
 	 */
 
-#if defined(__ppc64__) /* NGK hack for now */
-	vm_page_size = 4096;
-#else
+#ifdef HOST_MACH_MSG_TRAP	
+	host_info_size = 0;
+        _host_mach_msg_trap_return_ = host_info(host,
+                                           HOST_MACH_MSG_TRAP,
+                                           0,
+                                           &host_info_size);
+#endif
+
 	(void)host_page_size(host, &vm_page_size);
-#endif
-	vm_page_mask = vm_page_size - 1;
-	if (vm_page_size == 0) {
-		/* guard against unlikely craziness */
-		vm_page_shift = 0;
-	} else {
-		/*
-		 * Unfortunately there's no kernel interface to get the
-		 * vm_page_shift, but it's easy enough to calculate.
-		 */
-		for (vm_page_shift = 0;
-		     (vm_page_size & (1 << vm_page_shift)) == 0;
-		     vm_page_shift++)
-			continue;
-	}
 
 	mach_port_deallocate(mach_task_self_, host);
 
@@ -212,35 +197,12 @@
 			     VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
 		/* ignore result, we don't care if it failed */
 	}
-
 	return(0);
 }
 
-#ifdef __DYNAMIC__
-/* libc_initializer is the dyld initializer for libc (3760827) */
-static void libc_initializer() __attribute__((constructor));
-static void
-libc_initializer()
-{
-	mach_init();
-}
-#endif /* __DYNAMIC__ */
-
-/* mach_init may get called from the initializer and from crt.c, but only
- * call mach_init_doit() once */
 int mach_init(void)
 {
-	int ret;
-
-	if (mach_init_inited)
-		return(0);
-	mach_init_inited = TRUE;
-	ret = mach_init_doit(0);
-
-	/* Do other Libc initialization */
-	other_libc_init();
-
-	return ret;
+        return(mach_init_doit(0));
 }
 
 int	(*mach_init_routine)(void) = mach_init;