* [PATCH] xquad_portio fix declaration missmatch
@ 2006-02-02 0:43 Andy Whitcroft
2006-02-02 17:26 ` Alexey Dobriyan
0 siblings, 1 reply; 4+ messages in thread
From: Andy Whitcroft @ 2006-02-02 0:43 UTC (permalink / raw)
To: Andrew Morton; +Cc: Martin Bligh, linux-kernel
xquad_portio fix declaration missmatch
It seems that the latest gcc-4.x sees the inconsistancy between the
export of and static declaration of xquad_portio where previous versions
have not. Fix it up.
arch/i386/boot/compressed/misc.c:125: error: static declaration of
'xquad_portio' follows non-static declaration
include/asm/io.h:315: error: previous declaration of 'xquad_portio' was here
Against: 2.6.16-rc1-mm4
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
misc.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -upN reference/arch/i386/boot/compressed/misc.c current/arch/i386/boot/compressed/misc.c
--- reference/arch/i386/boot/compressed/misc.c
+++ current/arch/i386/boot/compressed/misc.c
@@ -122,7 +122,7 @@ static int vidport;
static int lines, cols;
#ifdef CONFIG_X86_NUMAQ
-static void * xquad_portio = NULL;
+void * xquad_portio = NULL;
#endif
#include "../../../../lib/inflate.c"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xquad_portio fix declaration missmatch
2006-02-02 0:43 [PATCH] xquad_portio fix declaration missmatch Andy Whitcroft
@ 2006-02-02 17:26 ` Alexey Dobriyan
2006-02-02 21:31 ` Andy Whitcroft
0 siblings, 1 reply; 4+ messages in thread
From: Alexey Dobriyan @ 2006-02-02 17:26 UTC (permalink / raw)
To: Andy Whitcroft; +Cc: Andrew Morton, Martin Bligh, linux-kernel
On Thu, Feb 02, 2006 at 12:43:06AM +0000, Andy Whitcroft wrote:
> xquad_portio fix declaration missmatch
> arch/i386/boot/compressed/misc.c:125: error: static declaration of
> 'xquad_portio' follows non-static declaration
> include/asm/io.h:315: error: previous declaration of 'xquad_portio' was here
> --- reference/arch/i386/boot/compressed/misc.c
> +++ current/arch/i386/boot/compressed/misc.c
> @@ -122,7 +122,7 @@ static int vidport;
> static int lines, cols;
>
> #ifdef CONFIG_X86_NUMAQ
> -static void * xquad_portio = NULL;
> +void * xquad_portio = NULL;
> #endif
Can you explain why it should stay in misc.c?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xquad_portio fix declaration missmatch
2006-02-02 17:26 ` Alexey Dobriyan
@ 2006-02-02 21:31 ` Andy Whitcroft
2006-02-02 21:59 ` Andy Whitcroft
0 siblings, 1 reply; 4+ messages in thread
From: Andy Whitcroft @ 2006-02-02 21:31 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Andrew Morton, Martin Bligh, linux-kernel
Alexey Dobriyan wrote:
> On Thu, Feb 02, 2006 at 12:43:06AM +0000, Andy Whitcroft wrote:
>
>>xquad_portio fix declaration missmatch
>
>
>> arch/i386/boot/compressed/misc.c:125: error: static declaration of
>> 'xquad_portio' follows non-static declaration
>> include/asm/io.h:315: error: previous declaration of 'xquad_portio' was here
>
>
>>--- reference/arch/i386/boot/compressed/misc.c
>>+++ current/arch/i386/boot/compressed/misc.c
>>@@ -122,7 +122,7 @@ static int vidport;
>> static int lines, cols;
>>
>> #ifdef CONFIG_X86_NUMAQ
>>-static void * xquad_portio = NULL;
>>+void * xquad_portio = NULL;
>> #endif
>
>
> Can you explain why it should stay in misc.c?
Indeed it does feel like it should be a numaq special in the numaq
specific files. I'll spin that and test it and see if there is a reason
why its _not_ like that already.
-apw
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xquad_portio fix declaration missmatch
2006-02-02 21:31 ` Andy Whitcroft
@ 2006-02-02 21:59 ` Andy Whitcroft
0 siblings, 0 replies; 4+ messages in thread
From: Andy Whitcroft @ 2006-02-02 21:59 UTC (permalink / raw)
To: Andy Whitcroft; +Cc: Alexey Dobriyan, Andrew Morton, Martin Bligh, linux-kernel
Andy Whitcroft wrote:
> Indeed it does feel like it should be a numaq special in the numaq
> specific files. I'll spin that and test it and see if there is a reason
> why its _not_ like that already.
Ok. It seems pretty clear when you look at it. The io commands are
used out of the minimal header generated to unzip a compressed kernel image.
-apw
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-02-02 22:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-02 0:43 [PATCH] xquad_portio fix declaration missmatch Andy Whitcroft
2006-02-02 17:26 ` Alexey Dobriyan
2006-02-02 21:31 ` Andy Whitcroft
2006-02-02 21:59 ` Andy Whitcroft
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox