Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / include / linux / binfmts.h

diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 688ab0de7810c2ed8e2b1698d472e67e43862780..b40fc633f3be678b992faf08d537f82244744a37 100644 (file)
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -15,7 +15,6 @@ struct filename;
  * This structure is used to hold the arguments that are used when loading binaries.
  */
 struct linux_binprm {
-       char buf[BINPRM_BUF_SIZE];
 #ifdef CONFIG_MMU
        struct vm_area_struct *vma;
        unsigned long vma_pages;
@@ -64,6 +63,8 @@ struct linux_binprm {
        unsigned long loader, exec;
 
        struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */
+
+       char buf[BINPRM_BUF_SIZE];
 } __randomize_layout;
 
 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0