Skip to contentSkip to conversation

potential parse error in ifdef part 3

PATCH In review Yoann Padioleau 2 participants 2 messages Jun 4, 2007 – Jun 5, 2007

Subsystems (4)
Kernel janitors m68k architecture m68k on Apple macintosh Turbochannel
lore
Share & tools
lore

Yoann Padioleau

author
#0 lore raw

PATCH 1/1 potential parse error in ifdef part 3

parse errors in ifdefs

Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs.

Signed-off-by Yoann Padioleau <[email protected]>
 arch/i386/math-emu/fpu_entry.c |    2 +-
 arch/m68k/mac/debug.c          |    2 +-
 arch/ppc/syslib/qspan_pci.c    |    4 ++--
 arch/sh64/kernel/pci_sh5.c     |    8 ++++----
 drivers/cdrom/mcdx.c           |    2 +-
 drivers/tc/zs.c                |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
arch/m68k/mac/debug.c +1 -1
index 7a5bed5..e8a5713 100644
@@ -71,7 +71,7 @@ #ifdef DEBUG_SCREEN
 
 	/* calculate current offset */
 	pengoffset = (unsigned char *)mac_videobase +
-		(150+line*2) * mac_rowbytes) + 80 * peng;
+		(150+line*2) * mac_rowbytes + 80 * peng;
 
 	pptr = pengoffset;
arch/ppc/syslib/qspan_pci.c +2 -2
index 85053b2..7a97c74 100644
@@ -365,13 +365,13 @@ int qspan_pcibios_find_class(unsigned in
 }
 
 void __init
-m8xx_pcibios_fixup(void))
+m8xx_pcibios_fixup(void)
 {
    /* Lots to do here, all board and configuration specific. */
 }
 
 void __init
-m8xx_setup_pci_ptrs(void))
+m8xx_setup_pci_ptrs(void)
 {
 	set_config_access_method(qspan);
arch/sh64/kernel/pci_sh5.c +4 -4
index fb51660..3334f99 100644
@@ -521,10 +521,10 @@ #if 1
 		bus->resource[0]->start = PCIBIOS_MIN_IO;
 		bus->resource[1]->start = PCIBIOS_MIN_MEM;
 #else
-		bus->resource[0]->end = 0
-		bus->resource[1]->end = 0
-		bus->resource[0]->start =0
-		  bus->resource[1]->start = 0;
+		bus->resource[0]->end = 0;
+		bus->resource[1]->end = 0;
+		bus->resource[0]->start =0;
+		bus->resource[1]->start = 0;
 #endif
 		/* Turn off downstream PF memory address range by default */
 		bus->resource[2]->start = 1024*1024;
drivers/cdrom/mcdx.c +1 -1
index f574962..4310cc8 100644
@@ -1053,11 +1053,11 @@ static void __exit mcdx_exit(void)
 	if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) {
 		xwarn("cleanup() unregister_blkdev() failed\n");
 	}
-	blk_cleanup_queue(mcdx_queue);
 #if !MCDX_QUIET
 	else
 	xinfo("cleanup() succeeded\n");
 #endif
+	blk_cleanup_queue(mcdx_queue);
 }
 
 #ifdef MODULE
drivers/tc/zs.c +1 -1
index 3524e3f..61de78a 100644
@@ -2182,7 +2182,7 @@ struct dec_serial_hook zs_kgdbhook = {
 	.init_info	= kgdbhook_init_info,
 	.rx_char	= kgdbhook_rx_char,
 	.cflags		= B38400 | CS8 | CLOCAL,
-}
+};
 
 void __init zs_kgdb_hook(int tty_num)
 {
arch/i386/math-emu/fpu_entry.c +1 -1
index ddf8fa3..1853524 100644
@@ -754,7 +754,7 @@ #endif /* PECULIAR_486 */
     return -1;
   if ( offset )
     if (__copy_to_user(d+other, (u_char *)&S387->st_space, offset))
-      return -1
+      return -1;
   RE_ENTRANT_CHECK_ON;
 
   return 1;

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

maintainer
#1 lore raw
Quoted 8 lines · Yoann Padioleau

parse errors in ifdefs

Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs.

arch/m68k/mac/debug.c #ifdef DEBUG_SCREEN · line 76

Quoted 7 lines
arch/m68k/mac/debug.c +1 -1
@@ -71,7 +71,7 @@ #ifdef DEBUG_SCREEN
 
 	/* calculate current offset */
 	pengoffset = (unsigned char *)mac_videobase +
-		(150+line*2) * mac_rowbytes) + 80 * peng;
+		(150+line*2) * mac_rowbytes + 80 * peng;
 
 	pptr = pengoffset;

Already fixed in 4eb527a0ca83de28e773371f42abad2ab1ed7fdf

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
Kernel-janitors mailing list [email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors