[PATCH] UML TT-mode-only compile fix.

[PATCH] UML TT-mode-only compile fix.

[Junichi Uekawa]

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

Hi,

In today's linus's git tree, uml doesn't compile when it's configured for 
only TT-mode.

This regression caused by:
	8923648c125421b0fcb240cde607e2748d099ab8
	[PATCH] uml: clear SKAS0/3 flags when running in TT mode

Signed-off-by: Junichi Uekawa <dancer@debian.org>


diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -334,8 +334,10 @@ int linux_main(int argc, char **argv)
 		add_arg(DEFAULT_COMMAND_LINE);
 
 	os_early_checks();
+#ifdef CONFIG_MODE_SKAS
 	if (force_tt)
 		clear_can_do_skas();
+#endif
 	mode_tt = force_tt ? 1 : !can_do_skas();
 #ifndef CONFIG_MODE_TT
 	if (mode_tt) {



[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] UML TT-mode-only compile fix.

[Blaisorblade]

On Sunday 09 October 2005 07:06, Junichi Uekawa wrote:
> Hi,
>
> In today's linus's git tree, uml doesn't compile when it's configured for
> only TT-mode.

> This regression caused by:
> 	8923648c125421b0fcb240cde607e2748d099ab8
> 	[PATCH] uml: clear SKAS0/3 flags when running in TT mode
>
> Signed-off-by: Junichi Uekawa <dancer@debian.org>
Thanks for the report and the patch, however I want to fix things a bit 
differently... the thing _should_ compile anyway.

The macro is declared anyway and the var should exist anyway.
The problem is just that they aren't declared, I think. Will fix.

> diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
> --- a/arch/um/kernel/um_arch.c
> +++ b/arch/um/kernel/um_arch.c
> @@ -334,8 +334,10 @@ int linux_main(int argc, char **argv)
>  		add_arg(DEFAULT_COMMAND_LINE);
>
>  	os_early_checks();
> +#ifdef CONFIG_MODE_SKAS
>  	if (force_tt)
>  		clear_can_do_skas();
> +#endif
>  	mode_tt = force_tt ? 1 : !can_do_skas();
>  #ifndef CONFIG_MODE_TT
>  	if (mode_tt) {

-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it

Re: [uml-devel] [PATCH] UML TT-mode-only compile fix.

[Jeff Dike]

On Sun, Oct 09, 2005 at 02:06:42PM +0900, Junichi Uekawa wrote:
> Hi,
> 
> In today's linus's git tree, uml doesn't compile when it's configured for 
> only TT-mode.
> 
> This regression caused by:
> 	8923648c125421b0fcb240cde607e2748d099ab8
> 	[PATCH] uml: clear SKAS0/3 flags when running in TT mode
> 
> Signed-off-by: Junichi Uekawa <dancer@debian.org>

Can you send this to Linus, with an Acked-by: me?

				Jeff

Re: [uml-devel] Re: [PATCH] UML TT-mode-only compile fix.

[Jeff Dike]

On Sun, Oct 09, 2005 at 09:26:04PM +0200, Blaisorblade wrote:
> Thanks for the report and the patch, however I want to fix things a bit 
> differently... the thing _should_ compile anyway.
> 
> The macro is declared anyway and the var should exist anyway.
> The problem is just that they aren't declared, I think. Will fix.

Junichi, ignore what I said earlier.  If Blaisorblade wants to fix it 
differently, then we'll use his patch instead.

				Jeff

Re: [uml-devel] Re: [PATCH] UML TT-mode-only compile fix.

[Junichi Uekawa]

Hi,


> On Sun, Oct 09, 2005 at 09:26:04PM +0200, Blaisorblade wrote:
> > Thanks for the report and the patch, however I want to fix things a bit 
> > differently... the thing _should_ compile anyway.
> > 
> > The macro is declared anyway and the var should exist anyway.
> > The problem is just that they aren't declared, I think. Will fix.
> 
> Junichi, ignore what I said earlier.  If Blaisorblade wants to fix it 
> differently, then we'll use his patch instead.

No problem with me.


regards,
	junichi.