Module Name: src
Committed By: christos
Date: Sat Mar 20 01:47:12 UTC 2010
Modified Files:
src/sys/kern: exec_elf.c
Log Message:
fix debugging code.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/exec_elf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.16 src/sys/kern/exec_elf.c:1.17
--- src/sys/kern/exec_elf.c:1.16 Fri Mar 19 21:45:30 2010
+++ src/sys/kern/exec_elf.c Fri Mar 19 21:47:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.16 2010/03/20 01:45:30 christos Exp $ */
+/* $NetBSD: exec_elf.c,v 1.17 2010/03/20 01:47:12 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.16 2010/03/20 01:45:30 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.17 2010/03/20 01:47:12 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -149,8 +149,10 @@
uprintf("r=0x%x a=0x%x p=0x%x Delta=0x%lx\n", r, l2, PGSHIFT,
delta);
offset = ELF_TRUNC(delta, pax_align) + PAGE_SIZE;
+#ifdef PAX_ASLR_DEBUG
uprintf("pax offset=0x%zx entry=0x%llx\n",
- pax_offset, (unsigned long long)eh->e_entry);
+ offset, (unsigned long long)eh->e_entry);
+#endif /* PAX_ASLR_DEBUG */
} else
#endif /* PAX_ASLR */
offset = PAGE_SIZE;
