xnu-1504.9.26.tar.gz

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

diff --git a/bsd/kern/kern_panicinfo.c b/bsd/kern/kern_panicinfo.c
index 9ad8549f1ef5169a4e7234954b84de0e2605b026..024ec52208fa0f11a33fbb4f9c5d9c09aeb6f0b2 100644 (file)
--- a/bsd/kern/kern_panicinfo.c
+++ b/bsd/kern/kern_panicinfo.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #include <sys/param.h>
@@ -51,14 +57,8 @@ extern int sysctl_dopanicinfo(int *, u_int, user_addr_t, size_t *, user_addr_t,
 static int image_size_limit = PANIC_IMAGE_SIZE_LIMIT;
 
 __private_extern__ int
-sysctl_dopanicinfo(name, namelen, oldp, oldlenp, newp, newlen, p)
-       int *name;
-       u_int namelen;
-       user_addr_t oldp;
-       size_t *oldlenp;
-       user_addr_t newp;
-       size_t newlen;
-       struct proc *p;
+sysctl_dopanicinfo(int *name, u_int namelen, user_addr_t oldp, size_t *oldlenp,
+                  user_addr_t newp, size_t newlen, struct proc *p)
 {
        int error = 0;
        vm_offset_t newimage = (vm_offset_t )NULL;
@@ -66,7 +66,6 @@ sysctl_dopanicinfo(name, namelen, oldp, oldlenp, newp, newlen, p)
        unsigned char * prev_image_ptr;
        unsigned int prev_image_size;
 
-
        /* all sysctl names at this level are terminal */
        if (namelen != 1)
                return (ENOTDIR);               /* overloaded */
@@ -104,7 +103,7 @@ sysctl_dopanicinfo(name, namelen, oldp, oldlenp, newp, newlen, p)
                                return (ENOMEM);
 
                        /* allocate some kernel wired memory for the new image */
-                       kret = kmem_alloc(kernel_map, &newimage, (vm_size_t)round_page_32(newlen));
+                       kret = kmem_alloc(kernel_map, &newimage, (vm_size_t)round_page(newlen));
 
                        if (kret != KERN_SUCCESS) {
                                switch (kret) {
@@ -165,8 +164,8 @@ sysctl_dopanicinfo(name, namelen, oldp, oldlenp, newp, newlen, p)
 
                        /* free the wired memory used by the previous image */
                        if ( prev_image_ptr != NULL ) {
-                               (void)kmem_free(kernel_map, (vm_offset_t) prev_image_ptr, (vm_size_t)round_page_32(prev_image_size));
-                               printf("Panic UI memory freed (%d)\n", round_page_32(prev_image_size));
+                               (void)kmem_free(kernel_map, (vm_offset_t) prev_image_ptr, (vm_size_t)round_page(prev_image_size));
+                               printf("Panic UI memory freed (%p)\n", (void *)round_page(prev_image_size));
                        }
                }
 
@@ -174,7 +173,7 @@ sysctl_dopanicinfo(name, namelen, oldp, oldlenp, newp, newlen, p)
 
 errout:
                if ( newimage != (vm_offset_t )NULL )
-                       (void)kmem_free(kernel_map, newimage, (vm_size_t)round_page_32(newlen));
+                       (void)kmem_free(kernel_map, newimage, (vm_size_t)round_page(newlen));
 
                return (error);
        }