2 files changed, 54 insertions, 39 deletions
diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h
new file mode 100644
index 000000000000..386440317b0c
--- /dev/null
+++ b/include/linux/elf-fdpic.h
@@ -0,0 +1,51 @@
+/* FDPIC ELF load map
+ *
+ * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _LINUX_ELF_FDPIC_H
+#define _LINUX_ELF_FDPIC_H
+#include <uapi/linux/elf-fdpic.h>
+/*
+ * binfmt binary parameters structure
+ */
+struct elf_fdpic_params {
+        struct elfhdr                   hdr;            /* ref copy of ELF header */
+        struct elf_phdr                 *phdrs;         /* ref copy of PT_PHDR table */
+        struct elf32_fdpic_loadmap      *loadmap;       /* loadmap to be passed to userspace */
+        unsigned long                   elfhdr_addr;    /* mapped ELF header user address */
+        unsigned long                   ph_addr;        /* mapped PT_PHDR user address */
+        unsigned long                   map_addr;       /* mapped loadmap user address */
+        unsigned long                   entry_addr;     /* mapped entry user address */
+        unsigned long                   stack_size;     /* stack size requested (PT_GNU_STACK) */
+        unsigned long                   dynamic_addr;   /* mapped PT_DYNAMIC user address */
+        unsigned long                   load_addr;      /* user address at which to map binary */
+        unsigned long                   flags;
+#define ELF_FDPIC_FLAG_ARRANGEMENT      0x0000000f      /* PT_LOAD arrangement flags */
+#define ELF_FDPIC_FLAG_INDEPENDENT      0x00000000      /* PT_LOADs can be put anywhere */
+#define ELF_FDPIC_FLAG_HONOURVADDR      0x00000001      /* PT_LOAD.vaddr must be honoured */
+#define ELF_FDPIC_FLAG_CONSTDISP        0x00000002      /* PT_LOADs require constant
+                                                         * displacement */
+#define ELF_FDPIC_FLAG_CONTIGUOUS       0x00000003      /* PT_LOADs should be contiguous */
+#define ELF_FDPIC_FLAG_EXEC_STACK       0x00000010      /* T if stack to be executable */
+#define ELF_FDPIC_FLAG_NOEXEC_STACK     0x00000020      /* T if stack not to be executable */
+#define ELF_FDPIC_FLAG_EXECUTABLE       0x00000040      /* T if this object is the executable */
+#define ELF_FDPIC_FLAG_PRESENT          0x80000000      /* T if this object is present */
+};
+#ifdef CONFIG_MMU
+extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
+                                      struct elf_fdpic_params *interp_params,
+                                      unsigned long *start_stack,
+                                      unsigned long *start_brk);
+#endif
+#endif /* _LINUX_ELF_FDPIC_H */
diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h
index 1065078938f9..3921e33aec8e 100644
--- a/include/uapi/linux/elf-fdpic.h
+++ b/include/uapi/linux/elf-fdpic.h
@@ -9,8 +9,8 @@
 * 2 of the License, or (at your option) any later version.
 */
-#ifndef _LINUX_ELF_FDPIC_H
+#ifndef _UAPI_LINUX_ELF_FDPIC_H
-#define _LINUX_ELF_FDPIC_H
+#define _UAPI_LINUX_ELF_FDPIC_H
 #include <linux/elf.h>
@@ -31,40 +31,4 @@ struct elf32_fdpic_loadmap {
 #define ELF32_FDPIC_LOADMAP_VERSION     0x0000
-#ifndef __KERNEL__
+#endif /* _UAPI_LINUX_ELF_FDPIC_H */
-/*
- * binfmt binary parameters structure
- */
-struct elf_fdpic_params {
-        struct elfhdr                   hdr;            /* ref copy of ELF header */
-        struct elf_phdr                 *phdrs;         /* ref copy of PT_PHDR table */
-        struct elf32_fdpic_loadmap      *loadmap;       /* loadmap to be passed to userspace */
-        unsigned long                   elfhdr_addr;    /* mapped ELF header user address */
-        unsigned long                   ph_addr;        /* mapped PT_PHDR user address */
-        unsigned long                   map_addr;       /* mapped loadmap user address */
-        unsigned long                   entry_addr;     /* mapped entry user address */
-        unsigned long                   stack_size;     /* stack size requested (PT_GNU_STACK) */
-        unsigned long                   dynamic_addr;   /* mapped PT_DYNAMIC user address */
-        unsigned long                   load_addr;      /* user address at which to map binary */
-        unsigned long                   flags;
-#define ELF_FDPIC_FLAG_ARRANGEMENT      0x0000000f      /* PT_LOAD arrangement flags */
-#define ELF_FDPIC_FLAG_INDEPENDENT      0x00000000      /* PT_LOADs can be put anywhere */
-#define ELF_FDPIC_FLAG_HONOURVADDR      0x00000001      /* PT_LOAD.vaddr must be honoured */
-#define ELF_FDPIC_FLAG_CONSTDISP        0x00000002      /* PT_LOADs require constant
-                                                         * displacement */
-#define ELF_FDPIC_FLAG_CONTIGUOUS       0x00000003      /* PT_LOADs should be contiguous */
-#define ELF_FDPIC_FLAG_EXEC_STACK       0x00000010      /* T if stack to be executable */
-#define ELF_FDPIC_FLAG_NOEXEC_STACK     0x00000020      /* T if stack not to be executable */
-#define ELF_FDPIC_FLAG_EXECUTABLE       0x00000040      /* T if this object is the executable */
-#define ELF_FDPIC_FLAG_PRESENT          0x80000000      /* T if this object is present */
-};
-#ifdef CONFIG_MMU
-extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
-                                      struct elf_fdpic_params *interp_params,
-                                      unsigned long *start_stack,
-                                      unsigned long *start_brk);
-#endif
-#endif /* __KERNEL__ */
-#endif /* _LINUX_ELF_FDPIC_H */

diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h new file mode 100644 index 000000000000..386440317b0c --- /dev/null +++ b/include/linux/elf-fdpic.h
@@ -0,0 +1,51 @@
		1	/* FDPIC ELF load map
		2	*
		3	* Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
		4	* Written by David Howells (dhowells@redhat.com)
		5	*
		6	* This program is free software; you can redistribute it and/or
		7	* modify it under the terms of the GNU General Public License
		8	* as published by the Free Software Foundation; either version
		9	* 2 of the License, or (at your option) any later version.
		10	*/
		11
		12	#ifndef _LINUX_ELF_FDPIC_H
		13	#define _LINUX_ELF_FDPIC_H
		14
		15	#include <uapi/linux/elf-fdpic.h>
		16
		17	/*
		18	* binfmt binary parameters structure
		19	*/
		20	struct elf_fdpic_params {
		21	struct elfhdr hdr; /* ref copy of ELF header */
		22	struct elf_phdr phdrs; / ref copy of PT_PHDR table */
		23	struct elf32_fdpic_loadmap loadmap; / loadmap to be passed to userspace */
		24	unsigned long elfhdr_addr; /* mapped ELF header user address */
		25	unsigned long ph_addr; /* mapped PT_PHDR user address */
		26	unsigned long map_addr; /* mapped loadmap user address */
		27	unsigned long entry_addr; /* mapped entry user address */
		28	unsigned long stack_size; /* stack size requested (PT_GNU_STACK) */
		29	unsigned long dynamic_addr; /* mapped PT_DYNAMIC user address */
		30	unsigned long load_addr; /* user address at which to map binary */
		31	unsigned long flags;
		32	#define ELF_FDPIC_FLAG_ARRANGEMENT 0x0000000f /* PT_LOAD arrangement flags */
		33	#define ELF_FDPIC_FLAG_INDEPENDENT 0x00000000 /* PT_LOADs can be put anywhere */
		34	#define ELF_FDPIC_FLAG_HONOURVADDR 0x00000001 /* PT_LOAD.vaddr must be honoured */
		35	#define ELF_FDPIC_FLAG_CONSTDISP 0x00000002 /* PT_LOADs require constant
		36	* displacement */
		37	#define ELF_FDPIC_FLAG_CONTIGUOUS 0x00000003 /* PT_LOADs should be contiguous */
		38	#define ELF_FDPIC_FLAG_EXEC_STACK 0x00000010 /* T if stack to be executable */
		39	#define ELF_FDPIC_FLAG_NOEXEC_STACK 0x00000020 /* T if stack not to be executable */
		40	#define ELF_FDPIC_FLAG_EXECUTABLE 0x00000040 /* T if this object is the executable */
		41	#define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */
		42	};
		43
		44	#ifdef CONFIG_MMU
		45	extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
		46	struct elf_fdpic_params *interp_params,
		47	unsigned long *start_stack,
		48	unsigned long *start_brk);
		49	#endif
		50
		51	#endif /* _LINUX_ELF_FDPIC_H */


diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h index 1065078938f9..3921e33aec8e 100644 --- a/include/uapi/linux/elf-fdpic.h +++ b/include/uapi/linux/elf-fdpic.h
@@ -9,8 +9,8 @@
9	* 2 of the License, or (at your option) any later version.	9	* 2 of the License, or (at your option) any later version.
10	*/	10	*/
11		11
12	#ifndef _LINUX_ELF_FDPIC_H	12	#ifndef _UAPI_LINUX_ELF_FDPIC_H
13	#define _LINUX_ELF_FDPIC_H	13	#define _UAPI_LINUX_ELF_FDPIC_H
14		14
15	#include <linux/elf.h>	15	#include <linux/elf.h>
16		16
@@ -31,40 +31,4 @@ struct elf32_fdpic_loadmap {
31		31
32	#define ELF32_FDPIC_LOADMAP_VERSION 0x0000	32	#define ELF32_FDPIC_LOADMAP_VERSION 0x0000
33		33
34	#ifndef __KERNEL__	34	#endif /* _UAPI_LINUX_ELF_FDPIC_H */
35	/*
36	* binfmt binary parameters structure
37	*/
38	struct elf_fdpic_params {
39	struct elfhdr hdr; /* ref copy of ELF header */
40	struct elf_phdr phdrs; / ref copy of PT_PHDR table */
41	struct elf32_fdpic_loadmap loadmap; / loadmap to be passed to userspace */
42	unsigned long elfhdr_addr; /* mapped ELF header user address */
43	unsigned long ph_addr; /* mapped PT_PHDR user address */
44	unsigned long map_addr; /* mapped loadmap user address */
45	unsigned long entry_addr; /* mapped entry user address */
46	unsigned long stack_size; /* stack size requested (PT_GNU_STACK) */
47	unsigned long dynamic_addr; /* mapped PT_DYNAMIC user address */
48	unsigned long load_addr; /* user address at which to map binary */
49	unsigned long flags;
50	#define ELF_FDPIC_FLAG_ARRANGEMENT 0x0000000f /* PT_LOAD arrangement flags */
51	#define ELF_FDPIC_FLAG_INDEPENDENT 0x00000000 /* PT_LOADs can be put anywhere */
52	#define ELF_FDPIC_FLAG_HONOURVADDR 0x00000001 /* PT_LOAD.vaddr must be honoured */
53	#define ELF_FDPIC_FLAG_CONSTDISP 0x00000002 /* PT_LOADs require constant
54	* displacement */
55	#define ELF_FDPIC_FLAG_CONTIGUOUS 0x00000003 /* PT_LOADs should be contiguous */
56	#define ELF_FDPIC_FLAG_EXEC_STACK 0x00000010 /* T if stack to be executable */
57	#define ELF_FDPIC_FLAG_NOEXEC_STACK 0x00000020 /* T if stack not to be executable */
58	#define ELF_FDPIC_FLAG_EXECUTABLE 0x00000040 /* T if this object is the executable */
59	#define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */
60	};
61
62	#ifdef CONFIG_MMU
63	extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
64	struct elf_fdpic_params *interp_params,
65	unsigned long *start_stack,
66	unsigned long *start_brk);
67	#endif
68	#endif /* __KERNEL__ */
69
70	#endif /* _LINUX_ELF_FDPIC_H */