xnu-792.10.96.tar.gz

[apple/xnu.git] / osfmk / ppc / savearea.c

diff --git a/osfmk/ppc/savearea.c b/osfmk/ppc/savearea.c
index af1ae6e7e3d4ad499d379e8b2e815ce9d8e122d0..fcda2ab4c9312fae33ff8f06fd0d8e21b6db3618 100644 (file)
--- a/osfmk/ppc/savearea.c
+++ b/osfmk/ppc/savearea.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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,
- * 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@
  */
@@ -27,7 +24,6 @@
  *
  */
 
-#include <cpus.h>
 #include <debug.h>
 #include <mach_kgdb.h>
 #include <mach_vm_debug.h>
@@ -207,7 +203,7 @@ void savearea_init(vm_offset_t addr) {
 /*
  * This will populate the local list  and get the first one for the system
  */    
-       per_proc_info[0].next_savearea = (vm_offset_t)save_get();
+       getPerProc()->next_savearea = (vm_offset_t)save_get();
 
 /*
  *     The system is now able to take interruptions
@@ -277,7 +273,7 @@ void save_adjust(void) {
                sctl = (savearea_comm *)save_trim_free();               /* Trim list to the need count, return start of trim list */
                                
                while(sctl) {                                                                   /* Release the free pages back to the kernel */
-                       sctlnext = (savearea_comm *)sctl->save_prev;    /* Get next in list */
+                       sctlnext = CAST_DOWN(savearea_comm *, sctl->save_prev); /* Get next in list */  
                        kmem_free(kernel_map, (vm_offset_t) sctl, PAGE_SIZE);   /* Release the page */
                        sctl = sctlnext;                                                        /* Chain onwards */
                }
@@ -300,7 +296,7 @@ void save_adjust(void) {
                        
                        bzero((void *)freepage, PAGE_SIZE);                     /* Clear it all to zeros */
                        freepage->sac_alloc = 0;                                        /* Mark all entries taken */
-                       freepage->sac_vrswap = ((uint64_t)physpage << 12) ^ (uint64_t)freepage; /* XOR to calculate conversion mask */
+                       freepage->sac_vrswap = ((uint64_t)physpage << 12) ^ (uint64_t)((uintptr_t)freepage);    /* XOR to calculate conversion mask */
        
                        freepage->sac_flags |= 0x0000EE00;                      /* Set debug eyecatcher */
                                                
@@ -312,7 +308,7 @@ void save_adjust(void) {
 /*
  *             Fake up information to make the saveareas look like a zone
  */
-
+void
 save_fake_zone_info(int *count, vm_size_t *cur_size, vm_size_t *max_size, vm_size_t *elem_size,
                    vm_size_t *alloc_size, int *collectable, int *exhaustable)
 {