Merge from master.

2014-07-31 18:30:39 +09:00
parent b58682dd73
commit 3fa6818962
5 changed files with 6 additions and 1 deletions
--- a/kernel/include/process.h
+++ b/kernel/include/process.h
@@ -91,7 +91,7 @@
 #include <futex.h>
 #include <rlimit.h>

-#define	AUXV_LEN	12
+#define	AUXV_LEN	14

 struct vm_range {
 	struct list_head list;
--- a/kernel/include/syscall.h
+++ b/kernel/include/syscall.h
@@ -119,6 +119,7 @@ struct program_load_desc {
 	unsigned long at_phent;
 	unsigned long at_phnum;
 	unsigned long at_entry;
+	unsigned long at_clktck;
 	char *args;
 	unsigned long args_len;
 	char *envs;