Re: UML/2.6.14-rc3 doesn't work fixes
Al Viro <viro <at> ftp.linux.org.uk>
2005-10-02 18:37:58 GMT
On Sun, Oct 02, 2005 at 08:01:21PM +0200, Blaisorblade wrote:
> On Sunday 02 October 2005 17:51, Jeff Dike wrote:
> > On Sun, Oct 02, 2005 at 12:13:39PM +0200, Blaisorblade wrote:
>
> > He did, and I found the same problem and sent him back the fix. I guess
> > he sent in the original patch.
> Ok, he just said he sent a mismerged patch, but it's ok.
> > I was planning on sending it in after 2.6.14 because of its size.
> Al, is that ok for you if we follow this original plan?
>
> In this case, I'll post the dropping patch and re-send the Kbuild fix of my
> last batch (conflicted with Al's patch, but now it's needed again).
Up to Jeff; IMO it's easier to restore the variant past his review (with
incremental replacing that DEFINE_LONGS), but maintainer gets to decide;
that was the reason for Cc when patch got sent to Linus, after all...
diff -urN RC14-rc2-git6-base/arch/um/sys-i386/user-offsets.c current/arch/um/sys-i386/user-offsets.c
--- RC14-rc2-git6-base/arch/um/sys-i386/user-offsets.c 2005-09-25 23:28:27.000000000 -0400
+++ current/arch/um/sys-i386/user-offsets.c 2005-10-02 14:08:15.000000000 -0400
<at> <at> -46,7 +46,7 <at> <at>
OFFSET(HOST_SC_FP_ST, _fpstate, _st);
OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);
- DEFINE_LONGS(HOST_FRAME_SIZE, FRAME_SIZE);
+ DEFINE(HOST_FRAME_SIZE, FRAME_SIZE);
DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));
DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));
-------------------------------------------------------
(Continue reading)