broken compile fixes for 2.4.18 or 2.4.19-pre1
PATCH 1/1 broken compile fixes for 2.4.18 or 2.4.19-pre1
I found few places with broken open or close comment. This patch applies cleanly to either 2.4.18 or 2.4.19-pre1.
John Kim
arm/kernel/dma-arc.c +1 -1
@@ -96,7 +96,7 @@/* 10/1/1999 DAG - Presume whether there is an outstanding command? */ extern unsigned int fdc1772_fdc_int_done; - * Explicit! If the int done is 0 then 1 int to go */ +/* Explicit! If the int done is 0 then 1 int to go */ return (fdc1772_fdc_int_done==0 )?1 :0 ; }
cris/drivers/lpslave/e100lpslavenet.c +1 -1
@@ -310,7 +310,7 @@IO_STATE (R_PAR0_CONFIG , iautofd, noninv) |/* Not used in reverse direction, don't care */ IO_STATE (R_PAR0_CONFIG , istrb, noninv) | -/* Not connected, don't care / +/* Not connected, don't care */ IO_STATE (R_PAR0_CONFIG , iinit, noninv) |/* perror is GND and reverse wants 0, noninv */ IO_STATE(R_PAR0_CONFIG, iperr, noninv) |
mips/kernel/smp.c +1 -1
@@ -156,7 +156,7 @@sprintf (p->comm,"%s%d" ,"Idle" , i); init_tasks[i] = p; p->processor = i; - p->cpus_runnable =1 << i;/* we schedule the first task manually * + p->cpus_runnable =1 << i;/* we schedule the first task manually */ del_from_runqueue (p);unhash_process (p);/* Attach to the address space of init_task. */
mips64/math-emu/cp1emu.c +1 -1
@@ -29,7 +29,7 @@* Notes: * 1) the IEEE754 library (-le) performs the actual arithmetic; * 2) if you know that you won't have an fpu, then you'll get much -* better performance by compiling with -msoft-float! */ +* better performance by compiling with -msoft-float! * * Nov 7, 2000 * Massive changes to integrate with Linux kernel.
char/rocket_int.h +1 -1
@@ -185,7 +185,7 @@/* Old clock prescale definition and baud rates associated with it */ -#define CLOCK_PRESC 0x19 *//* mod 9 (divide by 10) prescale */ +#define CLOCK_PRESC 0x19/* mod 9 (divide by 10) prescale */ #define BRD50 4607#define BRD75 3071#define BRD110 2094
char/serial_tx3912.h +1 -1
@@ -24,7 +24,7 @@#define UART_TXOVERRUN_INT 3/* transmit overrun error (25, 15) */ #define UART_EMPTY_INT 2/* both trans/recv regs empty (24, 14) */ #define UART_DMAFULL_INT 1/* DMA at end of buffer (23, 13) */ -#define UART_DMAHALF_INT 0 /* DMA halfway through buffer */ (22, 12) */ +#define UART_DMAHALF_INT 0/* DMA halfway through buffer (22, 12) */ #define UARTA_SHIFT 22#define UARTB_SHIFT 12
arm/kernel/dma-arc.c
Quoted 2 lines · John Kim
arm/kernel/dma-arc.c +0
-0
Thanks.
Signature · 2 lines
Russell King ([email protected]) The developer of ARM Linux http://www.arm.linux.org.uk/personal/aboutme.html
Your patch has not applied cleanly here in some places.
Please regenerate it against -pre2 as soon as its out and resend me.
Thanks
Quoted 3 lines · John Kim
I found few places with broken open or close comment. This patch applies cleanly to either 2.4.18 or 2.4.19-pre1.
Quoted 9 lines · you
Your patch has not applied cleanly here in some places.
Please regenerate it against -pre2 as soon as its out and resend me.
Thanks
Quoted 2 lines · John Kim
I found few places with broken open or close comment. This patch applies cleanly to either 2.4.18 or 2.4.19-pre1.
Sorry about that. Here is new patch to apply against 2.4.19-pre2. Thanks.
John Kim
arm/kernel/dma-arc.c +1 -1
@@ -96,7 +96,7 @@/* 10/1/1999 DAG - Presume whether there is an outstanding command? */ extern unsigned int fdc1772_fdc_int_done; - * Explicit! If the int done is 0 then 1 int to go */ +/* Explicit! If the int done is 0 then 1 int to go */ return (fdc1772_fdc_int_done==0 )?1 :0 ; }
cris/drivers/lpslave/e100lpslavenet.c +1 -1
@@ -310,7 +310,7 @@IO_STATE (R_PAR0_CONFIG , iautofd, noninv) |/* Not used in reverse direction, don't care */ IO_STATE (R_PAR0_CONFIG , istrb, noninv) | -/* Not connected, don't care / +/* Not connected, don't care */ IO_STATE (R_PAR0_CONFIG , iinit, noninv) |/* perror is GND and reverse wants 0, noninv */ IO_STATE(R_PAR0_CONFIG, iperr, noninv) |
mips64/math-emu/cp1emu.c +1 -1
@@ -29,7 +29,7 @@* Notes: * 1) the IEEE754 library (-le) performs the actual arithmetic; * 2) if you know that you won't have an fpu, then you'll get much -* better performance by compiling with -msoft-float! */ +* better performance by compiling with -msoft-float! * * Nov 7, 2000 * Massive changes to integrate with Linux kernel.
char/rocket_int.h +1 -1
@@ -185,7 +185,7 @@/* Old clock prescale definition and baud rates associated with it */ -#define CLOCK_PRESC 0x19 *//* mod 9 (divide by 10) prescale */ +#define CLOCK_PRESC 0x19/* mod 9 (divide by 10) prescale */ #define BRD50 4607#define BRD75 3071#define BRD110 2094