The patch titled
potential parse error in ifdef part 3
has been added to the -mm tree. Its filename is
potential-parse-error-in-ifdef-part-3.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: potential parse error in ifdef part 3
From: Yoann Padioleau <padator@xxxxxxxxxx>
Fix various bits of obviously-busted code which we're not happening to
compile, due to ifdefs.
Signed-off-by: Yoann Padioleau <padator@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/math-emu/fpu_entry.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 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff -puN arch/i386/math-emu/fpu_entry.c~potential-parse-error-in-ifdef-part-3 arch/i386/math-emu/fpu_entry.c
--- a/arch/i386/math-emu/fpu_entry.c~potential-parse-error-in-ifdef-part-3
+++ a/arch/i386/math-emu/fpu_entry.c
@@ -754,7 +754,7 @@ int save_i387_soft(void *s387, struct _f
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;
diff -puN arch/ppc/syslib/qspan_pci.c~potential-parse-error-in-ifdef-part-3 arch/ppc/syslib/qspan_pci.c
--- a/arch/ppc/syslib/qspan_pci.c~potential-parse-error-in-ifdef-part-3
+++ a/arch/ppc/syslib/qspan_pci.c
@@ -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);
diff -puN arch/sh64/kernel/pci_sh5.c~potential-parse-error-in-ifdef-part-3 arch/sh64/kernel/pci_sh5.c
--- a/arch/sh64/kernel/pci_sh5.c~potential-parse-error-in-ifdef-part-3
+++ a/arch/sh64/kernel/pci_sh5.c
@@ -521,10 +521,10 @@ void __init pcibios_fixup_bus(struct pci
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;
diff -puN drivers/cdrom/mcdx.c~potential-parse-error-in-ifdef-part-3 drivers/cdrom/mcdx.c
--- a/drivers/cdrom/mcdx.c~potential-parse-error-in-ifdef-part-3
+++ a/drivers/cdrom/mcdx.c
@@ -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
diff -puN drivers/tc/zs.c~potential-parse-error-in-ifdef-part-3 drivers/tc/zs.c
--- a/drivers/tc/zs.c~potential-parse-error-in-ifdef-part-3
+++ a/drivers/tc/zs.c
@@ -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)
{
_
Patches currently in -mm which might be from padator@xxxxxxxxxx are
origin.patch
potential-parse-error-in-ifdef-part-3.patch
atari_pamsnetc-old-declaration-ritchie-style-fix.patch
usb-bugfix-gfp_kernel-gfp_atomic-in-spin_locked-region.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
