Fix compiles warnings in 2.4.6pre2
Subsystems (10)
PATCH 1/1 Fix compiles warnings in 2.4.6pre2
This patch fixes compile warnings when using gcc 3.0 cvs snapshots. It makes the following changes:
- Removes warnings about trigraphs (done by patching the Makefile in top directory
- changes text at the end of #endif statements to comments
- fixes warnings about use of labels at the end of compound statements
- fixes a warning about no newline at the end of net/khttpd/security.h
Let me know if you have any questions or comments.
Rich
Makefile +2 -2
@@ -87,7 +87,7 @@ CPPFLAGS := -D__KERNEL__ -I$(HPATH) -CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing +CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ + -fomit-frame-pointer -fno-strict-aliasing AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
#
diff -urN -X dontdiff linux/arch/i386/math-emu/fpu_trig.c rb/arch/i386/math-emu/fpu_trig.c
arch/i386/math-emu/fpu_trig.c +1 -0
@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +break ; } }else if ( (st0_tag == TAG_Valid) || (st0_tag == TW_Denormal) )
drivers/atm/fore200e.c +1 -0
@@ -439,6 +439,7 @@case FORE200E_STATE_BLANK :/* nothing to do for that state */ +break ; } }
diff -urN -X dontdiff linux/drivers/media/video/tuner.c rb/drivers/media/video/tuner.c
drivers/media/video/tuner.c +1 -0
@@ -558,6 +558,7 @@#endif default :/* nothing */ +break ; }return 0 ;
diff -urN -X dontdiff linux/drivers/net/tokenring/ibmtr.c rb/drivers/net/tokenring/ibmtr.c
drivers/net/tokenring/ibmtr.c +1 -1
@@ -1185,7 +1185,7 @@isa_writeb (~CMD_IN_SRB , ti->mmio +ACA_OFFSET +ACA_RESET +ISRA_ODD );isa_writeb (~SRB_RESP_INT , ti->mmio +ACA_OFFSET +ACA_RESET +ISRP_ODD ); - skip_reset: + skip_reset:; }/* SRB response */ if (status &ASB_FREE_INT ) {/* ASB response */
drivers/net/wan/hdlc.c +3 -1
@@ -1082,7 +1082,9 @@ }break ; -default :/* to be defined */ +default : +/* to be defined */ +break ; }dev_kfree_skb (skb);
diff -urN -X dontdiff linux/drivers/net/wan/sdla_fr.c rb/drivers/net/wan/sdla_fr.c
drivers/net/wan/sdla_fr.c +2 -1
@@ -4435,7 +4435,8 @@trigger_fr_poll (dev);break ; -default :// ARP's and RARP's -- Shouldn't happen. +default : +break ;// ARP's and RARP's -- Shouldn't happen. }return 0 ;
diff -urN -X dontdiff linux/drivers/net/wan/sdla_x25.c rb/drivers/net/wan/sdla_x25.c
drivers/net/wan/sdla_x25.c +1 -1
@@ -3108,7 +3108,7 @@case 0x08 :/* modem failure */ #ifndef MODEM_NOT_LOG printk (KERN_INFO "%s: modem failure!\n" , card->devname); -#endif MODEM_NOT_LOG +#endif /* MODEM_NOT_LOG */ api_oob_event (card,mb);break ;
diff -urN -X dontdiff linux/drivers/scsi/NCR53c406a.c rb/drivers/scsi/NCR53c406a.c
drivers/scsi/NCR53c406a.c +1 -1
@@ -221,7 +221,7 @@ (void *)0xc8000 };#define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned )) -#endif USE_BIOS +#endif /* USE_BIOS */ /* possible i/o port addresses */ static unsigned short ports[] =
@@ -244,7 +244,7 @@ { "Copyright (C) Acculogic, Inc.\r\n2.8M Diskette Extension Bios ver
4.04.03 03/01/1993", 61, 82 },
};
#define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))
-#endif USE_BIOS
+#endif /* USE_BIOS */
/* ============================================================ */
@@ -347,7 +347,7 @@
return tmp;
}
-#endif USE_DMA
+#endif /* USE_DMA */
#if USE_PIO
static __inline__ int NCR53c406a_pio_read(unsigned char *request,
@@ -455,7 +455,7 @@
}
return 0; }
-#endif USE_PIO
+#endif /* USE_PIO */
int __init
NCR53c406a_detect(Scsi_Host_Template * tpnt){
@@ -481,7 +481,7 @@
}
DEB(printk("NCR53c406a BIOS found at %X\n", (unsigned int) bios_base););-#endif USE_BIOS
+#endif /* USE_BIOS */
#ifdef PORT_BASE
if (!request_region(port_base, 0x10, "NCR53c406a")) /* ports already
snatched */
@@ -512,7 +512,7 @@
}
}
}-#endif PORT_BASE
+#endif /* PORT_BASE */
if(!port_base){ /* no ports found */
printk("NCR53c406a: no available ports found\n");
@@ -550,7 +550,7 @@
#if USE_DMA
printk("NCR53c406a: No interrupts found and DMA mode defined. Giving
up.\n");
goto err_release;
-#endif USE_DMA
+#endif /* USE_DMA */
}
else {
DEB(printk("NCR53c406a: Shouldn't get here!\n"));
@@ -565,7 +565,7 @@
}
DEB(printk("Allocated DMA channel %d\n", dma_chan));-#endif USE_DMA
+#endif /* USE_DMA */
tpnt->present = 1;
tpnt->proc_name = "NCR53c406a";
@@ -820,8 +820,8 @@
printk("\n");
#else
printk(", pio=%02x\n", pio_status);-#endif USE_DMA
-#endif NCR53C406A_DEBUG
+#endif /* USE_DMA */
+#endif /* NCR53C406A_DEBUG */
if(int_reg & 0x80){ /* SCSI reset intr */
rtrc(3);
@@ -840,7 +840,7 @@
current_SC->scsi_done(current_SC);
return;
}-#endif USE_PIO
+#endif /* USE_PIO */
if(status & 0x20) { /* Parity error */
printk("NCR53c406a: Warning: parity error!\n");
@@ -885,7 +885,7 @@
#if USE_DMA /* No s/g support for DMA */
NCR53c406a_dma_write(current_SC->request_buffer,
current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
outb(TRANSFER_INFO | DMA_OP, CMD_REG);
#if USE_PIO
if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -900,7 +900,7 @@
}
}
REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
}
break;@@ -914,7 +914,7 @@
#if USE_DMA /* No s/g support for DMA */
NCR53c406a_dma_read(current_SC->request_buffer,
current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
outb(TRANSFER_INFO | DMA_OP, CMD_REG);
#if USE_PIO
if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -929,7 +929,7 @@
}
}
REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
}
break;@@ -1011,7 +1011,7 @@
return irq;
}
-#endif IRQ_LEV
+#endif /* IRQ_LEV */
static void chip_init()
{
diff -urN -X dontdiff linux/drivers/scsi/aic7xxx_old.c rb/drivers/scsi/aic7xxx_old.c
drivers/scsi/aic7xxx_old.c +1 -1
@@ -10100,7 +10100,7 @@ } /* while(pdev=....) */ }/* for PCI_DEVICES */ }/* PCI BIOS present */ -#endif CONFIG_PCI +#endif /* CONFIG_PCI */ #if defined(__i386__) || defined(__alpha__)/*
drivers/scsi/scsi.c +1 -1
@@ -2356,8 +2356,8 @@/* The rest of these are not yet implemented. */ case MODULE_SCSI_CONST :case MODULE_SCSI_IOCTL : -break ;default : +break ; }return ; }
diff -urN -X dontdiff linux/drivers/scsi/sym53c8xx.c rb/drivers/scsi/sym53c8xx.c
drivers/scsi/sym53c8xx.c +1 -0
@@ -11564,6 +11564,7 @@OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));return ; out_stuck: +return ; }
diff -urN -X dontdiff linux/drivers/sound/gus_wave.c rb/drivers/sound/gus_wave.c
drivers/sound/gus_wave.c +3 -0
@@ -2102,6 +2102,7 @@break ;default : +break ; } }
@@ -3282,6 +3283,7 @@break ;default : +break ; }restore_flags (flags); }
@@ -3423,6 +3425,7 @@break ;default : +break ; } status =gus_look8 (0x49 );/* * Get Sampling IRQ Status
drivers/sound/pss.c +1 -0
@@ -766,6 +766,7 @@break ;default : +break ; }return 0 ; }
drivers/sound/wf_midi.c +1 -0
@@ -231,6 +231,7 @@break ;default : +break ; } }else { mi->m_prev_status = midic;
drivers/sound/ymfpci.c +1 -0
@@ -1829,6 +1829,7 @@* for instance we get SNDCTL_TMR_CONTINUE here. * XXX Is there sound_generic_ioctl() around? */ +break ; }return -ENOTTY ; }
drivers/usb/net1080.c +1 -1
@@ -599,7 +599,7 @@ }#ifdef VERBOSE dbg ("no read resubmitted" ); -#endif VERBOSE +#endif /* VERBOSE */ }/*-------------------------------------------------------------------------*/
fs/sysv/inode.c +0 -0
@@ -442,7 +442,7 @@brelse (bh); printk("SysV FS: cannot read superblock in %d byte mode\n",
sb->sv_block_size);
goto failed;
- superblock_ok:
+ superblock_ok:;
}
} else {
/* Switch to 512 block size. Unfortunately, we have to
diff -urN -X dontdiff linux/include/asm-i386/mca_dma.h rb/include/asm-i386/mca_dma.h
include/asm-i386/mca_dma.h +1 -1
@@ -199,4 +199,4 @@ outb(mode, MCA_DMA_REG_EXE); } -#endif MCA_DMA_H +#endif /* MCA_DMA_H */
diff -urN -X dontdiff linux/include/linux/coda_cache.h rb/include/linux/coda_cache.h
include/linux/coda_cache.h +1 -1
@@ -19,4 +19,4 @@/* for downcalls and attributes and lookups */ void coda_flag_inode_children (struct inode *inode,int flag); -#endif _CFSNC_HEADER_ +#endif /* _CFSNC_HEADER_ */
net/khttpd/security.h +1 -1
@@ -9,4 +9,4 @@ char value[32-sizeof(void*)]; /* fill 1 cache-line */ }; -#endif +#endif
PATCH 1/1 Fix fbcon.c compiles error on 2.4.7pre2
It seems that some part is missing, In AC patch , it have that function.
dfbb
drivers/video/fbcon.c renamed from drivers/video/fbcon.c.orig +0 -2
@@ -1150,13 +1150,11 @@ } }scr_writew (c, d); -console_conditional_schedule (); s++; d++; }while (s < le);if (s > start) p->dispsw->putcs (conp, p, start, s - start,real_y (p, line), x); -console_conditional_schedule ();if (offset >0 ) line++;else {
Re: [PATCH] Fix fbcon.c compiles error on 2.4.7pre2
Quoted 1 line
It seems that some part is missing, In AC patch , it have that function.
My fault. The amount of backlogged stuff Im trying to shift makes it tricky to get thse right straight off