Commit a17627ef authored by Yoann Padioleau's avatar Yoann Padioleau Committed by Linus Torvalds

potential parse error in ifdef part 3

Fix various bits of obviously-busted code which we're not happening to
compile, due to ifdefs.
Signed-off-by: default avatarYoann Padioleau <padator@wanadoo.fr>
Cc: Andi Kleen <ak@suse.de>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cdc0ed0
...@@ -754,7 +754,7 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf) ...@@ -754,7 +754,7 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf)
return -1; return -1;
if ( offset ) if ( offset )
if (__copy_to_user(d+other, (u_char *)&S387->st_space, offset)) if (__copy_to_user(d+other, (u_char *)&S387->st_space, offset))
return -1 return -1;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
return 1; return 1;
......
...@@ -365,13 +365,13 @@ int qspan_pcibios_find_class(unsigned int class_code, unsigned short index, ...@@ -365,13 +365,13 @@ int qspan_pcibios_find_class(unsigned int class_code, unsigned short index,
} }
void __init void __init
m8xx_pcibios_fixup(void)) m8xx_pcibios_fixup(void)
{ {
/* Lots to do here, all board and configuration specific. */ /* Lots to do here, all board and configuration specific. */
} }
void __init void __init
m8xx_setup_pci_ptrs(void)) m8xx_setup_pci_ptrs(void)
{ {
set_config_access_method(qspan); set_config_access_method(qspan);
......
...@@ -521,9 +521,9 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) ...@@ -521,9 +521,9 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
bus->resource[0]->start = PCIBIOS_MIN_IO; bus->resource[0]->start = PCIBIOS_MIN_IO;
bus->resource[1]->start = PCIBIOS_MIN_MEM; bus->resource[1]->start = PCIBIOS_MIN_MEM;
#else #else
bus->resource[0]->end = 0 bus->resource[0]->end = 0;
bus->resource[1]->end = 0 bus->resource[1]->end = 0;
bus->resource[0]->start =0 bus->resource[0]->start =0;
bus->resource[1]->start = 0; bus->resource[1]->start = 0;
#endif #endif
/* Turn off downstream PF memory address range by default */ /* Turn off downstream PF memory address range by default */
......
...@@ -1053,11 +1053,11 @@ static void __exit mcdx_exit(void) ...@@ -1053,11 +1053,11 @@ static void __exit mcdx_exit(void)
if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) { if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) {
xwarn("cleanup() unregister_blkdev() failed\n"); xwarn("cleanup() unregister_blkdev() failed\n");
} }
blk_cleanup_queue(mcdx_queue);
#if !MCDX_QUIET #if !MCDX_QUIET
else else
xinfo("cleanup() succeeded\n"); xinfo("cleanup() succeeded\n");
#endif #endif
blk_cleanup_queue(mcdx_queue);
} }
#ifdef MODULE #ifdef MODULE
......
...@@ -2182,7 +2182,7 @@ struct dec_serial_hook zs_kgdbhook = { ...@@ -2182,7 +2182,7 @@ struct dec_serial_hook zs_kgdbhook = {
.init_info = kgdbhook_init_info, .init_info = kgdbhook_init_info,
.rx_char = kgdbhook_rx_char, .rx_char = kgdbhook_rx_char,
.cflags = B38400 | CS8 | CLOCAL, .cflags = B38400 | CS8 | CLOCAL,
} };
void __init zs_kgdb_hook(int tty_num) void __init zs_kgdb_hook(int tty_num)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment