* + replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch added to -mm tree
@ 2007-10-15 20:19 akpm
2007-10-16 1:56 ` Add missing ELF_CORE_XFPREG_TYPE #define to x86 Mark Nelson
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2007-10-15 20:19 UTC (permalink / raw)
To: mm-commits; +Cc: markn, ak, linux-arch, mingo, paulus, tglx
The patch titled
x86: replace NT_PRXFPREG with ELF_CORE_XFPREG_TYPE #define
has been added to the -mm tree. Its filename is
replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86: replace NT_PRXFPREG with ELF_CORE_XFPREG_TYPE #define
From: Mark Nelson <markn@au1.ibm.com>
Replace NT_PRXFPREG with ELF_CORE_XFPREG_TYPE in the coredump code which
allows for more flexibility in the note type for the state of 'extended
floating point' implementations in coredumps. New note types can now be
added with an appropriate #define.
This does #define ELF_CORE_XFPREG_TYPE to be NT_PRXFPREG in all
current users so there's are no change in behaviour.
This will let us use different note types on powerpc for the Altivec/VMX
state that some PowerPC cpus have (G4, PPC970, POWER6) and for the SPE
(signal processing extension) state that some embedded PowerPC cpus from
Freescale have.
Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/ia64/ia32/elfcore32.h | 1 +
fs/binfmt_elf.c | 8 ++++----
fs/binfmt_elf_fdpic.c | 8 ++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff -puN arch/ia64/ia32/elfcore32.h~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define arch/ia64/ia32/elfcore32.h
--- a/arch/ia64/ia32/elfcore32.h~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define
+++ a/arch/ia64/ia32/elfcore32.h
@@ -117,6 +117,7 @@ elf_core_copy_task_fpregs(struct task_st
}
#define ELF_CORE_COPY_XFPREGS 1
+#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
static inline int
elf_core_copy_task_xfpregs(struct task_struct *tsk, elf_fpxregset_t *xfpu)
{
diff -puN fs/binfmt_elf.c~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define
+++ a/fs/binfmt_elf.c
@@ -1411,7 +1411,7 @@ struct elf_thread_status
elf_fpregset_t fpu; /* NT_PRFPREG */
struct task_struct *thread;
#ifdef ELF_CORE_COPY_XFPREGS
- elf_fpxregset_t xfpu; /* NT_PRXFPREG */
+ elf_fpxregset_t xfpu; /* ELF_CORE_XFPREG_TYPE */
#endif
struct memelfnote notes[3];
int num_notes;
@@ -1446,8 +1446,8 @@ static int elf_dump_thread_status(long s
#ifdef ELF_CORE_COPY_XFPREGS
if (elf_core_copy_task_xfpregs(p, &t->xfpu)) {
- fill_note(&t->notes[2], "LINUX", NT_PRXFPREG, sizeof(t->xfpu),
- &t->xfpu);
+ fill_note(&t->notes[2], "LINUX", ELF_CORE_XFPREG_TYPE,
+ sizeof(t->xfpu), &t->xfpu);
t->num_notes++;
sz += notesize(&t->notes[2]);
}
@@ -1621,7 +1621,7 @@ static int elf_core_dump(long signr, str
#ifdef ELF_CORE_COPY_XFPREGS
if (elf_core_copy_task_xfpregs(current, xfpu))
fill_note(notes + numnote++,
- "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);
+ "LINUX", ELF_CORE_XFPREG_TYPE, sizeof(*xfpu), xfpu);
#endif
fs = get_fs();
diff -puN fs/binfmt_elf_fdpic.c~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define fs/binfmt_elf_fdpic.c
--- a/fs/binfmt_elf_fdpic.c~replace-nt_prxfpreg-with-elf_core_xfpreg_type-define
+++ a/fs/binfmt_elf_fdpic.c
@@ -1417,7 +1417,7 @@ struct elf_thread_status
elf_fpregset_t fpu; /* NT_PRFPREG */
struct task_struct *thread;
#ifdef ELF_CORE_COPY_XFPREGS
- elf_fpxregset_t xfpu; /* NT_PRXFPREG */
+ elf_fpxregset_t xfpu; /* ELF_CORE_XFPREG_TYPE */
#endif
struct memelfnote notes[3];
int num_notes;
@@ -1453,8 +1453,8 @@ static int elf_dump_thread_status(long s
#ifdef ELF_CORE_COPY_XFPREGS
if (elf_core_copy_task_xfpregs(p, &t->xfpu)) {
- fill_note(&t->notes[2], "LINUX", NT_PRXFPREG, sizeof(t->xfpu),
- &t->xfpu);
+ fill_note(&t->notes[2], "LINUX", ELF_CORE_XFPREG_TYPE,
+ sizeof(t->xfpu), &t->xfpu);
t->num_notes++;
sz += notesize(&t->notes[2]);
}
@@ -1690,7 +1690,7 @@ static int elf_fdpic_core_dump(long sign
#ifdef ELF_CORE_COPY_XFPREGS
if (elf_core_copy_task_xfpregs(current, xfpu))
fill_note(notes + numnote++,
- "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);
+ "LINUX", ELF_CORE_XFPREG_TYPE, sizeof(*xfpu), xfpu);
#endif
fs = get_fs();
_
Patches currently in -mm which might be from markn@au1.ibm.com are
origin.patch
replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch
powerpc-add-altivec-vmx-state-to-coredumps.patch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Add missing ELF_CORE_XFPREG_TYPE #define to x86
2007-10-15 20:19 + replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch added to -mm tree akpm
@ 2007-10-16 1:56 ` Mark Nelson
2007-10-18 1:05 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Mark Nelson @ 2007-10-16 1:56 UTC (permalink / raw)
To: akpm; +Cc: mm-commits, ak, linux-arch, mingo, paulus, tglx
Add two missing #define ELF_CORE_XFPREG_TYPE NT_PRXFPREG to x86
Signed-off-by: Mark Nelson <markn@au1.ibm.com>
---
Andrew: These two hunks were lost from
replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch because
of the merger of i386 and x86_64 (and my incredibly bad timing for
sending this patch). Apologies and thanks.
arch/x86/ia32/ia32_binfmt.c | 1 +
include/asm-x86/elf_32.h | 1 +
2 files changed, 2 insertions(+)
Index: linus/arch/x86/ia32/ia32_binfmt.c
===================================================================
--- linus.orig/arch/x86/ia32/ia32_binfmt.c
+++ linus/arch/x86/ia32/ia32_binfmt.c
@@ -188,6 +188,7 @@ elf_core_copy_task_fpregs(struct task_st
}
#define ELF_CORE_COPY_XFPREGS 1
+#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
static inline int
elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
{
Index: linus/include/asm-x86/elf_32.h
===================================================================
--- linus.orig/include/asm-x86/elf_32.h
+++ linus/include/asm-x86/elf_32.h
@@ -129,6 +129,7 @@ extern int dump_task_extended_fpu (struc
#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
#define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
+#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
#define VDSO_HIGH_BASE (__fix_to_virt(FIX_VDSO))
#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Add missing ELF_CORE_XFPREG_TYPE #define to x86
2007-10-16 1:56 ` Add missing ELF_CORE_XFPREG_TYPE #define to x86 Mark Nelson
@ 2007-10-18 1:05 ` Andrew Morton
2007-10-18 4:01 ` Mark Nelson
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2007-10-18 1:05 UTC (permalink / raw)
To: Mark Nelson; +Cc: ak, linux-arch, mingo, paulus, tglx
On Tue, 16 Oct 2007 11:56:46 +1000
Mark Nelson <markn@au1.ibm.com> wrote:
> Add two missing #define ELF_CORE_XFPREG_TYPE NT_PRXFPREG to x86
>
> Signed-off-by: Mark Nelson <markn@au1.ibm.com>
> ---
> Andrew: These two hunks were lost from
> replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch because
> of the merger of i386 and x86_64 (and my incredibly bad timing for
> sending this patch). Apologies and thanks.
>
> arch/x86/ia32/ia32_binfmt.c | 1 +
> include/asm-x86/elf_32.h | 1 +
> 2 files changed, 2 insertions(+)
>
> Index: linus/arch/x86/ia32/ia32_binfmt.c
> ===================================================================
> --- linus.orig/arch/x86/ia32/ia32_binfmt.c
> +++ linus/arch/x86/ia32/ia32_binfmt.c
> @@ -188,6 +188,7 @@ elf_core_copy_task_fpregs(struct task_st
> }
>
> #define ELF_CORE_COPY_XFPREGS 1
> +#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
> static inline int
> elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
> {
> Index: linus/include/asm-x86/elf_32.h
> ===================================================================
> --- linus.orig/include/asm-x86/elf_32.h
> +++ linus/include/asm-x86/elf_32.h
> @@ -129,6 +129,7 @@ extern int dump_task_extended_fpu (struc
> #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
> #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
> #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
> +#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
>
> #define VDSO_HIGH_BASE (__fix_to_virt(FIX_VDSO))
> #define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
I'm not sure what happened here. My current copy of
replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch has the above
changes in it, and the commit which went into mainline this morning looks
to be OK.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Add missing ELF_CORE_XFPREG_TYPE #define to x86
2007-10-18 1:05 ` Andrew Morton
@ 2007-10-18 4:01 ` Mark Nelson
0 siblings, 0 replies; 4+ messages in thread
From: Mark Nelson @ 2007-10-18 4:01 UTC (permalink / raw)
To: Andrew Morton; +Cc: ak, linux-arch, mingo, paulus, tglx
Andrew Morton wrote:
> On Tue, 16 Oct 2007 11:56:46 +1000
> Mark Nelson <markn@au1.ibm.com> wrote:
>
>> Add two missing #define ELF_CORE_XFPREG_TYPE NT_PRXFPREG to x86
>>
>> Signed-off-by: Mark Nelson <markn@au1.ibm.com>
>> ---
>> Andrew: These two hunks were lost from
>> replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch because
>> of the merger of i386 and x86_64 (and my incredibly bad timing for
>> sending this patch). Apologies and thanks.
>>
>> arch/x86/ia32/ia32_binfmt.c | 1 +
>> include/asm-x86/elf_32.h | 1 +
>> 2 files changed, 2 insertions(+)
>>
>> Index: linus/arch/x86/ia32/ia32_binfmt.c
>> ===================================================================
>> --- linus.orig/arch/x86/ia32/ia32_binfmt.c
>> +++ linus/arch/x86/ia32/ia32_binfmt.c
>> @@ -188,6 +188,7 @@ elf_core_copy_task_fpregs(struct task_st
>> }
>>
>> #define ELF_CORE_COPY_XFPREGS 1
>> +#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
>> static inline int
>> elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
>> {
>> Index: linus/include/asm-x86/elf_32.h
>> ===================================================================
>> --- linus.orig/include/asm-x86/elf_32.h
>> +++ linus/include/asm-x86/elf_32.h
>> @@ -129,6 +129,7 @@ extern int dump_task_extended_fpu (struc
>> #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
>> #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
>> #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
>> +#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
>>
>> #define VDSO_HIGH_BASE (__fix_to_virt(FIX_VDSO))
>> #define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
>
> I'm not sure what happened here. My current copy of
> replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch has the above
> changes in it, and the commit which went into mainline this morning looks
> to be OK.
>
Strange... Subtle bugs in mail scripts perhaps? Well anyway, as long as the
patch in mainline has everything (and it certainly looks like it does) I
guess it's all good :)
Many Thanks!
Mark.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-10-18 4:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-15 20:19 + replace-nt_prxfpreg-with-elf_core_xfpreg_type-define.patch added to -mm tree akpm
2007-10-16 1:56 ` Add missing ELF_CORE_XFPREG_TYPE #define to x86 Mark Nelson
2007-10-18 1:05 ` Andrew Morton
2007-10-18 4:01 ` Mark Nelson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).