From:Suzuki K. Poulose <suz...@in.ibm.com>
gencore-elf.c will be reused for the compat ELF class support. Hence, define
macros to get the right member for each class.
Signed-off-by: Suzuki K. Poulose <suz...@in.ibm.com>
---
fs/proc/gencore-elf.c | 31 ++++++++++++++++++++-----------
fs/proc/gencore.h | 16 +++++++++++++++-
2 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/fs/proc/gencore-elf.c b/fs/proc/gencore-elf.c
index 244e5bb..3c6b67a 100644
--- a/fs/proc/gencore-elf.c
+++ b/fs/proc/gencore-elf.c
@@ -33,6 +33,15 @@
#endif
#include "gencore.h"
+#ifndef et_prstatus
+/* prstatus field for native elf, in elf_thread_core_info*/
+#define et_prstatus u.prstatus
+#endif
+
+#ifndef cp_prpsinfo
+/* prpsinfo field for native elf, in core_proc */
+#define cp_prpsinfo u.prpsinfo
+#endif
static int notesize(struct memelfnote *men)
{
@@ -77,14 +86,14 @@ static int fill_thread_core_info(struct
elf_thread_core_info *tinfo,
unsigned int i;
const struct user_regset_view *view =
task_user_regset_view(tinfo->task);
- fill_prstatus(&tinfo->prstatus, tinfo->task, 0);
+ fill_prstatus(&tinfo->et_prstatus, tinfo->task, 0);
do_thread_regset_writeback(tinfo->task, &view->regsets[0]);
(void) view->regsets[0].get(tinfo->task, &view->regsets[0],
- 0, sizeof(tinfo->prstatus.pr_reg),
- &tinfo->prstatus.pr_reg, NULL);
+ 0, sizeof(tinfo->et_prstatus.pr_reg),
+ &tinfo->et_prstatus.pr_reg, NULL);
fill_note(&tinfo->notes[0], "CORE", NT_PRSTATUS,
- sizeof(tinfo->prstatus), &tinfo->prstatus);
+ sizeof(tinfo->et_prstatus), &tinfo->et_prstatus);
cp->notes_size += notesize(&tinfo->notes[0]);
tinfo->num_notes = view->n;
@@ -109,7 +118,7 @@ static int fill_thread_core_info(struct
elf_thread_core_info *tinfo,
regset->core_note_type,
size, data);
else {
- tinfo->prstatus.pr_fpvalid = 1;
+ tinfo->et_prstatus.pr_fpvalid = 1;
fill_note(&tinfo->notes[i], "CORE",
NT_PRFPREG, size, data);
}
@@ -128,14 +137,14 @@ static int fill_thread_core_info(struct
elf_thread_core_info *tinfo,
elf_fpxregset_t xfpu, *pxfpu;
#endif
- fill_prstatus(&tinfo->prstatus, t->task, 0);
- elf_core_copy_task_regs(t->task, &tinfo->prstatus.pr_reg);
+ fill_prstatus(&tinfo->et_prstatus, t->task, 0);
+ elf_core_copy_task_regs(t->task, &tinfo->et_prstatus.pr_reg);
fill_note(&tinfo->notes[0], "CORE", NT_PRSTATUS,
- sizeof(t->prstatus), &t->prstatus);
+ sizeof(t->et_prstatus), &t->et_prstatus);
cp->notes_size += notesize(&tinfo->notes[0]);
tinfo->num_notes = 1;
- if (tinfo->prstatus.pr_fpvalid = elf_core_copy_task_fpregs(tinfo->task,
+ if (tinfo->et_prstatus.pr_fpvalid =
elf_core_copy_task_fpregs(tinfo->task,
NULL, &fpu)) {
pfpu = kzalloc(sizeof(*pfpu), GFP_KERNEL);
if (pfpu == NULL)
@@ -168,9 +177,9 @@ static int collect_notes(struct core_proc *cp)
struct elf_thread_core_info *tinfo;
/* Fill the 2 process wide notes */
- fill_psinfo(&cp->prpsinfo, cp->task, cp->task->mm);
+ fill_psinfo(&cp->cp_prpsinfo, cp->task, cp->task->mm);
fill_note(&cp->psinfo, "CORE", NT_PRPSINFO,
- sizeof(struct elf_prpsinfo), &cp->prpsinfo);
+ sizeof(struct elf_prpsinfo), &cp->cp_prpsinfo);
cp->notes_size += notesize(&cp->psinfo);
fill_auxv_note(&cp->auxv, cp->task->mm);
diff --git a/fs/proc/gencore.h b/fs/proc/gencore.h
index d7a5fb3..60972a2 100644
--- a/fs/proc/gencore.h
+++ b/fs/proc/gencore.h
@@ -7,6 +7,9 @@
#include <linux/completion.h>
#include <linux/elfcore.h>
#include <linux/elfcore-internal.h>
+#ifdef CONFIG_COMPAT_BINFMT_ELF
+#include <linux/elfcore-compat.h>
+#endif
enum { ELF_CLASS_NATIVE, ELF_CLASS_COMPAT };
@@ -15,6 +18,12 @@ struct elf_thread_core_info {
struct elf_thread_core_info *next;
struct task_struct *task;
struct elf_prstatus prstatus;
+ union {
+ struct elf_prstatus prstatus;
+#ifdef CONFIG_COMPAT_BINFMT_ELF
+ struct compat_elf_prstatus compat_prstatus;
+#endif
+ } u;
struct memelfnote notes[0];
};
@@ -28,7 +37,12 @@ struct core_proc {
struct elf_thread_core_info *tinfo;
struct memelfnote psinfo;
struct memelfnote auxv;
- struct elf_prpsinfo prpsinfo;
+ union {
+ struct elf_prpsinfo prpsinfo;
+#ifdef CONFIG_COMPAT_BINFMT_ELF
+ struct compat_elf_prpsinfo compat_prpsinfo;
+#endif
+ } u;
size_t elf_buflen; /* size of elf_buf */
size_t nphdrs; /* number of phdrs */
size_t notes_size;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
