xnu-517.tar.gz

[apple/xnu.git] / osfmk / ddb / db_watch.c

diff --git a/osfmk/ddb/db_watch.c b/osfmk/ddb/db_watch.c
index 513ebbb48c63997ec540fa1c00a22bc02c595fca..f6de79c762648cb286c04c7de3b542fe74e07e9f 100644 (file)
--- a/osfmk/ddb/db_watch.c
+++ b/osfmk/ddb/db_watch.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * 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@
  */
@@ -394,8 +397,8 @@ db_set_watchpoints(void)
            for (watch = db_watchpoint_list; watch != 0; watch = watch->link) {
                map = (watch->task)? watch->task->map: kernel_map;
                pmap_protect(map->pmap,
-                            trunc_page(watch->loaddr),
-                            round_page(watch->hiaddr),
+                            trunc_page_32(watch->loaddr),
+                            round_page_32(watch->hiaddr),
                             VM_PROT_READ);
            }
            db_watchpoints_inserted = TRUE;
@@ -424,8 +427,8 @@ db_find_watchpoint(
            if (watch->task == task_space) {
                if ((watch->loaddr <= addr) && (addr < watch->hiaddr))
                    return (TRUE);
-               else if ((trunc_page(watch->loaddr) <= addr) &&
-                        (addr < round_page(watch->hiaddr)))
+               else if ((trunc_page_32(watch->loaddr) <= addr) &&
+                        (addr < round_page_32(watch->hiaddr)))
                    found = watch;
            }
        }