Re: [git pull] m68k updates for 2.6.34

[Maxim Kuvyrkov <maxim@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

<CC trimmed>

On 2/28/10 12:13 AM, Geert Uytterhoeven wrote:
> 	Hi Linus,
>
> Please pull to receive the m68k updates for 2.6.34.
>
> The parts that impact m68knommu have been acked by Greg.
> The pmac_zilog parts have been acked by BenH.
>
> Thanks!
...
>        m68k: Define sigcontext ABI of ColdFire

I only now have noticed that an old version of this patch was merged in. 
  The latest version was posted here 
(http://marc.info/?l=linux-m68k&m=126571455916199&w=2) and included a 
fix for the libSegFault to not overflow sc_fpstate field [I got the math 
wrong the first time round].

The attached patch fixes this problem.

Thanks,

-- 
Maxim Kuvyrkov
CodeSourcery
maxim@codesourcery.com
(650) 331-3385 x724

[-- Attachment #2: 0001-Fix-struct-sigcontext-for-ColdFire.patch --]
[-- Type: text/plain, Size: 1162 bytes --]

>From de4c0f12fd2fd3e8436218dfb5edba3b3d570ee0 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim@codesourcery.com>
Date: Wed, 3 Mar 2010 16:53:45 +0300
Subject: [PATCH] Fix `struct sigcontext' for ColdFire

LibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext'
and this patch avoids LibSegFault overflowing this field.  Also this
removes an unnecessary divergence from classic m68k.

Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com>
---
 arch/m68k/include/asm/sigcontext.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
index 1320eaa..a29dd74 100644
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -17,13 +17,11 @@ struct sigcontext {
 #ifndef __uClinux__
 # ifdef __mcoldfire__
 	unsigned long  sc_fpregs[2][2];	/* room for two fp registers */
-	unsigned long  sc_fpcntl[3];
-	unsigned char  sc_fpstate[16+6*8];
 # else
 	unsigned long  sc_fpregs[2*3];  /* room for two fp registers */
+# endif
 	unsigned long  sc_fpcntl[3];
 	unsigned char  sc_fpstate[216];
-# endif
 #endif
 };
 
-- 
1.6.6.1