Skip to contentSkip to conversation

xquad_portio fix declaration missmatch

PATCH In review Andy Whitcroft 2 participants 4 messages Feb 2, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xquad_portio fix declaration missmatch

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

---
 misc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
arch/i386/boot/compressed/misc.c +1 -1
diff -upN 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"
#1 lore raw
Quoted 9 lines · Andy Whitcroft

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

arch/i386/boot/compressed/misc.c static int vidport; · line 126

Quoted 6 lines
arch/i386/boot/compressed/misc.c +1 -1
@@ -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?

#2 lore raw
Quoted 15 lines · Alexey Dobriyan
Quoted 13 lines · Andy Whitcroft

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

arch/i386/boot/compressed/misc.c +0 -0
@@ -122,7 +122,7 @@ static int vidport;
 static int lines, cols;
 
Quoted 7 lines

arch/i386/boot/compressed/misc.c static int vidport; · line 126

Quoted 4 lines
arch/i386/boot/compressed/misc.c +1 -1
 #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

#3 lore raw
Quoted 3 lines · Andy Whitcroft

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