Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

parse errors in ifdefs

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

Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Yoann Padioleau and committed by
Linus Torvalds
f8343685 632155e6

+16 -16
+1 -1
Documentation/ia64/aliasing-test.c
··· 197 197 return rc; 198 198 } 199 199 200 - main() 200 + int main() 201 201 { 202 202 int rc; 203 203
+1 -1
arch/alpha/boot/tools/mkbb.c
··· 81 81 #define bootblock_label __u1.__label 82 82 #define bootblock_checksum __u2.__checksum 83 83 84 - main(int argc, char ** argv) 84 + int main(int argc, char ** argv) 85 85 { 86 86 bootblock bootblock_from_disk; 87 87 bootblock bootloader_image;
+1 -1
arch/arm/mm/alignment.c
··· 630 630 631 631 fs = get_fs(); 632 632 set_fs(KERNEL_DS); 633 - if thumb_mode(regs) { 633 + if (thumb_mode(regs)) { 634 634 fault = __get_user(tinstr, (u16 *)(instrptr & ~1)); 635 635 if (!(fault)) 636 636 instr = thumb2arm(tinstr);
+1 -1
arch/mips/jmr3927/rbhma3100/kgdb_io.c
··· 36 36 #define TIMEOUT 0xffffff 37 37 38 38 static int remoteDebugInitialized = 0; 39 - static void debugInit(int baud) 39 + static void debugInit(int baud); 40 40 41 41 int putDebugChar(unsigned char c) 42 42 {
+7 -7
arch/mips/pci/pci-ocelot.c
··· 71 71 } 72 72 73 73 static struct resource ocelot_mem_resource = { 74 - start = GT_PCI_MEM_BASE; 75 - end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; 74 + .start = GT_PCI_MEM_BASE, 75 + .end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1, 76 76 }; 77 77 78 78 static struct resource ocelot_io_resource = { 79 - start = GT_PCI_IO_BASE; 80 - end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; 79 + .start = GT_PCI_IO_BASE, 80 + .end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1, 81 81 }; 82 82 83 83 static struct pci_controller ocelot_pci_controller = { 84 - .pci_ops = gt64xxx_pci0_ops; 85 - .mem_resource = &ocelot_mem_resource; 86 - .io_resource = &ocelot_io_resource; 84 + .pci_ops = gt64xxx_pci0_ops, 85 + .mem_resource = &ocelot_mem_resource, 86 + .io_resource = &ocelot_io_resource, 87 87 }; 88 88 89 89 static int __init ocelot_pcibios_init(void)
+2 -2
drivers/mtd/nand/ppchameleonevb.c
··· 424 424 425 425 /* Release iomaps */ 426 426 this = (struct nand_chip *) &ppchameleon_mtd[1]; 427 - iounmap((void *) this->IO_ADDR_R; 427 + iounmap((void *) this->IO_ADDR_R); 428 428 this = (struct nand_chip *) &ppchameleonevb_mtd[1]; 429 - iounmap((void *) this->IO_ADDR_R; 429 + iounmap((void *) this->IO_ADDR_R); 430 430 431 431 /* Free the MTD device structure */ 432 432 kfree (ppchameleon_mtd);
+1 -1
drivers/net/fec_8xx/fec_main.c
··· 550 550 skbn = dev_alloc_skb(pkt_len + 2); 551 551 if (skbn != NULL) { 552 552 skb_reserve(skbn, 2); /* align IP header */ 553 - skb_copy_from_linear_data(skb 553 + skb_copy_from_linear_data(skb, 554 554 skbn->data, 555 555 pkt_len); 556 556 /* swap */
+1 -1
drivers/scsi/NCR5380.c
··· 2625 2625 #ifdef REAL_DMA 2626 2626 static void NCR5380_dma_complete(NCR5380_instance * instance) { 2627 2627 NCR5380_local_declare(); 2628 - struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata); 2628 + struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; 2629 2629 int transferred; 2630 2630 NCR5380_setup(instance); 2631 2631
+1 -1
fs/udf/super.c
··· 1351 1351 1352 1352 for (i=0; i<UDF_SB_NUMPARTS(sb); i++) 1353 1353 { 1354 - switch UDF_SB_PARTTYPE(sb, i) 1354 + switch (UDF_SB_PARTTYPE(sb, i)) 1355 1355 { 1356 1356 case UDF_VIRTUAL_MAP15: 1357 1357 case UDF_VIRTUAL_MAP20: