2005-10-04 19:01:47

by Jeff Dike

Subject: [PATCH 1/2] UML - Fix Al's build tidying

Al's build tidying missed one bit from me - without this UML doesn't boot.

Signed-off-by: Jeff Dike <[email protected]>
Index: linux-2.6.13/arch/um/sys-i386/user-offsets.c
===================================================================
--- linux-2.6.13.orig/arch/um/sys-i386/user-offsets.c 2005-10-04 13:33:39.000000000 -0400
+++ linux-2.6.13/arch/um/sys-i386/user-offsets.c 2005-10-04 14:57:24.000000000 -0400
@@ -46,7 +46,7 @@
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));

2005-10-04 19:10:19

by Al Viro

Subject: Re: [PATCH 1/2] UML - Fix Al's build tidying

On Tue, Oct 04, 2005 at 02:53:49PM -0400, Jeff Dike wrote:
> Al's build tidying missed one bit from me - without this UML doesn't boot.

ACK - my apologies for mismerge ;-/