TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse errors in ifdefs

Browse Source 
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>
This commit is contained in:
Yoann Padioleau
2007-06-01 00:46:36 -07:00
committed by Linus Torvalds
parent 632155e659
commit f834368564
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/ia64/aliasing-test.c
View File

@@ -197,7 +197,7 @@ int scan_rom(char *path, char *file)
return rc; return rc;
} }
main() int main()
{ {
int rc; int rc;

2
arch/alpha/boot/tools/mkbb.c
View File

@@ -81,7 +81,7 @@ typedef union __bootblock {
#define bootblock_label __u1.__label #define bootblock_label __u1.__label
#define bootblock_checksum __u2.__checksum #define bootblock_checksum __u2.__checksum
main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
bootblock bootblock_from_disk; bootblock bootblock_from_disk;
bootblock bootloader_image; bootblock bootloader_image;

2
arch/arm/mm/alignment.c
View File

@@ -630,7 +630,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
fs = get_fs(); fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
if thumb_mode(regs) { if (thumb_mode(regs)) {
fault = __get_user(tinstr, (u16 *)(instrptr & ~1)); fault = __get_user(tinstr, (u16 *)(instrptr & ~1));
if (!(fault)) if (!(fault))
instr = thumb2arm(tinstr); instr = thumb2arm(tinstr);

2
arch/mips/jmr3927/rbhma3100/kgdb_io.c
View File

@@ -36,7 +36,7 @@
#define TIMEOUT 0xffffff #define TIMEOUT 0xffffff
static int remoteDebugInitialized = 0; static int remoteDebugInitialized = 0;
static void debugInit(int baud) static void debugInit(int baud);
int putDebugChar(unsigned char c) int putDebugChar(unsigned char c)
{ {

14
arch/mips/pci/pci-ocelot.c
View File

@@ -71,19 +71,19 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data)
} }
static struct resource ocelot_mem_resource = { static struct resource ocelot_mem_resource = {
start = GT_PCI_MEM_BASE; .start = GT_PCI_MEM_BASE,
end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; .end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1,
}; };
static struct resource ocelot_io_resource = { static struct resource ocelot_io_resource = {
start = GT_PCI_IO_BASE; .start = GT_PCI_IO_BASE,
end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; .end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1,
}; };
static struct pci_controller ocelot_pci_controller = { static struct pci_controller ocelot_pci_controller = {
.pci_ops = gt64xxx_pci0_ops; .pci_ops = gt64xxx_pci0_ops,
.mem_resource = &ocelot_mem_resource; .mem_resource = &ocelot_mem_resource,
.io_resource = &ocelot_io_resource; .io_resource = &ocelot_io_resource,
}; };
static int __init ocelot_pcibios_init(void) static int __init ocelot_pcibios_init(void)

4
drivers/mtd/nand/ppchameleonevb.c
View File

@@ -424,9 +424,9 @@ static void __exit ppchameleonevb_cleanup(void)
/* Release iomaps */ /* Release iomaps */
this = (struct nand_chip *) &ppchameleon_mtd[1]; this = (struct nand_chip *) &ppchameleon_mtd[1];
iounmap((void *) this->IO_ADDR_R; iounmap((void *) this->IO_ADDR_R);
this = (struct nand_chip *) &ppchameleonevb_mtd[1]; this = (struct nand_chip *) &ppchameleonevb_mtd[1];
iounmap((void *) this->IO_ADDR_R; iounmap((void *) this->IO_ADDR_R);
/* Free the MTD device structure */ /* Free the MTD device structure */
kfree (ppchameleon_mtd); kfree (ppchameleon_mtd);

2
drivers/net/fec_8xx/fec_main.c
View File

@@ -550,7 +550,7 @@ static int fec_enet_rx_common(struct net_device *dev, int *budget)
skbn = dev_alloc_skb(pkt_len + 2); skbn = dev_alloc_skb(pkt_len + 2);
if (skbn != NULL) { if (skbn != NULL) {
skb_reserve(skbn, 2); /* align IP header */ skb_reserve(skbn, 2); /* align IP header */
skb_copy_from_linear_data(skb skb_copy_from_linear_data(skb,
skbn->data, skbn->data,
pkt_len); pkt_len);
/* swap */ /* swap */

2
drivers/scsi/NCR5380.c
View File

@@ -2625,7 +2625,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
#ifdef REAL_DMA #ifdef REAL_DMA
static void NCR5380_dma_complete(NCR5380_instance * instance) { static void NCR5380_dma_complete(NCR5380_instance * instance) {
NCR5380_local_declare(); NCR5380_local_declare();
struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata); struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
int transferred; int transferred;
NCR5380_setup(instance); NCR5380_setup(instance);

2
fs/udf/super.c
View File

@@ -1351,7 +1351,7 @@ udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
for (i=0; i<UDF_SB_NUMPARTS(sb); i++) for (i=0; i<UDF_SB_NUMPARTS(sb); i++)
{ {
switch UDF_SB_PARTTYPE(sb, i) switch (UDF_SB_PARTTYPE(sb, i))
{ {
case UDF_VIRTUAL_MAP15: case UDF_VIRTUAL_MAP15:
case UDF_VIRTUAL_MAP20: case UDF_VIRTUAL_MAP20: