xnu-792.24.17.tar.gz

[apple/xnu.git] / bsd / kern / bsd_stubs.c

diff --git a/bsd/kern/bsd_stubs.c b/bsd/kern/bsd_stubs.c
index cc8e42431c09565efe290d42180f5e567a357053..9a0c0605408911d19d8620051ec8c33f3420adb5 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @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. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * 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.

  * 
  * 

- * 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
+ * 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,
  * 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_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@

  */
 #include <sys/time.h>
 #include <kern/task.h>
  */
 #include <sys/time.h>
 #include <kern/task.h>


@@ -37,8 +31,6 @@
 #include <sys/proc_internal.h>
 #include <sys/buf.h>   /* for SET */
 #include <sys/user.h>
 #include <sys/proc_internal.h>
 #include <sys/buf.h>   /* for SET */
 #include <sys/user.h>

-#include <sys/sysent.h>
-#include <sys/sysproto.h>

 
 /* Just to satisfy pstat command */
 int     dmmin, dmmax, dmtext;
 
 /* Just to satisfy pstat command */
 int     dmmin, dmmax, dmtext;


@@ -49,7 +41,7 @@ kmem_mb_alloc(vm_map_t  mbmap, int size)
         vm_offset_t addr;
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
         vm_offset_t addr;
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,

-               KMA_NOPAGEWAIT|KMA_KOBJECT|KMA_LOMEM) == KERN_SUCCESS)
+               KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)

                        return(addr);
        else
                return(0);
                        return(addr);
        else
                return(0);


@@ -300,66 +292,3 @@ tbeproc(void *procp)
        return;
 }
 
        return;
 }
 

-
-/* 
- * WARNING - this is a temporary workaround for binary compatibility issues
- * with anti-piracy software that relies on patching ptrace (3928003).
- * This KPI will be removed in the system release after Tiger.
- */
-uintptr_t temp_patch_ptrace(uintptr_t new_ptrace)
-{
-       struct sysent *         callp;
-       sy_call_t *                     old_ptrace;
-#ifndef __ppc__
-       boolean_t       funnel_state;
-#endif
-
-       if (new_ptrace == 0)
-               return(0);
-               
-#ifdef __ppc__
-       enter_funnel_section(kernel_flock);
-#else
-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
-#endif
-       callp = &sysent[26];
-       old_ptrace = callp->sy_call;
-       
-       /* only allow one patcher of ptrace */
-       if (old_ptrace == (sy_call_t *) ptrace) {
-               callp->sy_call = (sy_call_t *) new_ptrace;
-       }
-       else {
-               old_ptrace = NULL;
-       }
-#ifdef __ppc__
-       exit_funnel_section( );
-#else
-       (void)thread_funnel_set(kernel_flock, funnel_state);
-#endif
-       
-       return((uintptr_t)old_ptrace);
-}
-
-void temp_unpatch_ptrace(void)
-{
-       struct sysent *         callp;
-#ifndef __ppc__
-       boolean_t       funnel_state;
-#endif
-               
-#ifdef __ppc__
-       enter_funnel_section(kernel_flock);
-#else
-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
-#endif
-       callp = &sysent[26];
-       callp->sy_call = (sy_call_t *) ptrace;
-#ifdef __ppc__
-       exit_funnel_section( );
-#else
-       (void)thread_funnel_set(kernel_flock, funnel_state);
-#endif
-       
-       return;
-}