CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Jan 25 17:56:45 UTC 2017

Modified Files:
        src/sys/kern: exec_elf32.c exec_elf64.c

Log Message:
The argument length is in bytes; don't use howmany()


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/exec_elf32.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/exec_elf64.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_elf32.c
diff -u src/sys/kern/exec_elf32.c:1.141 src/sys/kern/exec_elf32.c:1.142
--- src/sys/kern/exec_elf32.c:1.141	Tue Jul 22 04:18:33 2014
+++ src/sys/kern/exec_elf32.c	Wed Jan 25 12:56:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf32.c,v 1.141 2014/07/22 08:18:33 maxv Exp $	*/
+/*	$NetBSD: exec_elf32.c,v 1.142 2017/01/25 17:56:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_elf32.c,v 1.141 2014/07/22 08:18:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_elf32.c,v 1.142 2017/01/25 17:56:45 christos Exp $");
 
 #define	ELFSIZE	32
 
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: exec_elf32.c
 
 #include <sys/module.h>
 
-#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
-    sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
+#define ELF32_AUXSIZE (ELF_AUX_ENTRIES * sizeof(Aux32Info) \
+    + MAXPATHLEN + ALIGN(1))
 
 #ifdef COREDUMP
 #define	DEP	"coredump"

Index: src/sys/kern/exec_elf64.c
diff -u src/sys/kern/exec_elf64.c:1.6 src/sys/kern/exec_elf64.c:1.7
--- src/sys/kern/exec_elf64.c:1.6	Tue Jul 22 04:18:33 2014
+++ src/sys/kern/exec_elf64.c	Wed Jan 25 12:56:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf64.c,v 1.6 2014/07/22 08:18:33 maxv Exp $	*/
+/*	$NetBSD: exec_elf64.c,v 1.7 2017/01/25 17:56:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_elf64.c,v 1.6 2014/07/22 08:18:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_elf64.c,v 1.7 2017/01/25 17:56:45 christos Exp $");
 
 #define	ELFSIZE	64
 
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: exec_elf64.c
 
 #include <sys/module.h>
 
-#define ELF64_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux64Info), \
-    sizeof(Elf64_Addr)) + MAXPATHLEN + ALIGN(1))
+#define ELF64_AUXSIZE (ELF_AUX_ENTRIES * sizeof(Aux64Info) \
+    + MAXPATHLEN + ALIGN(1))
 
 #ifdef COREDUMP
 #define	DEP	"coredump"