Fix compile warnings in 2.4.0
Subsystems (15)
PATCH 1/1 Fix compile warnings in 2.4.0
This patch should fix the rest of the warnings about #endif statements when using the 20001225 gcc snapshot. Thanks to Keith Owens for providing a script to automate this process. It got the job done sooner and found warnings to fix for non x86 platforms.
Rich
arch/i386/kernel/head.S +1 -1
@@ -115,7 +115,7 @@ popfl jmp checkCPUtype 1: -#endif CONFIG_SMP +#endif /* CONFIG_SMP */ /* * Clear BSS first so that there are no surprises...
arch/i386/math-emu/control_w.h +1 -1
@@ -42,4 +42,4 @@/* FULL_PRECISION simulates all exceptions masked */ #define FULL_PRECISION (PR_64_BITS | RC_RND | 0x3f) -#endif _CONTROLW_H_ +#endif /* _CONTROLW_H_ */
arch/i386/math-emu/div_Xsig.S +12 -12
@@ -70,7 +70,7 @@ .long 0 FPU_result_1: .long 0 -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ .text
@@ -79,7 +79,7 @@ movl %esp,%ebp #ifndef NON_REENTRANT_FPU subl $28,%esp -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ pushl %esi pushl %edi
@@ -91,7 +91,7 @@ #ifdef PARANOID testl $0x80000000, XsigH(%ebx) /* Divisor */ je L_bugged -#endif PARANOID +#endif /* PARANOID */ /*---------------------------------------------------------------------------+
@@ -164,7 +164,7 @@ #ifdef PARANOID jb L_bugged_1 -#endif PARANOID +#endif /* PARANOID */ /* need to subtract another once of the denom */ incl FPU_result_3 /* Correct the answer */
@@ -177,7 +177,7 @@ #ifdef PARANOID sbbl $0,FPU_accum_3 jne L_bugged_1 /* Must check for non-zero result here */ -#endif PARANOID +#endif /* PARANOID */ /*----------------------------------------------------------------------*/ /* Half of the main problem is done, there is just a reduced numerator
@@ -207,7 +207,7 @@ #ifdef PARANOID je L_bugged_2 /* Can't bump the result to 1.0 */ -#endif PARANOID +#endif /* PARANOID */ LDo_2nd_div: cmpl $0,%ecx /* augmented denom msw */
@@ -230,7 +230,7 @@ #ifdef PARANOID jc L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ movl FPU_result_2,%eax /* Get the result back */ mull XsigL(%ebx) /* now mul the ls dw of the denom */
@@ -241,14 +241,14 @@ #ifdef PARANOID jc L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ jz LDo_3rd_32_bits #ifdef PARANOID cmpl $1,FPU_accum_2 jne L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ /* need to subtract another once of the denom */ movl XsigL(%ebx),%eax
@@ -260,14 +260,14 @@ #ifdef PARANOID jc L_bugged_2 jne L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ addl $1,FPU_result_2 /* Correct the answer */ adcl $0,FPU_result_3 #ifdef PARANOID jc L_bugged_2 /* Must check for non-zero result here */ -#endif PARANOID +#endif /* PARANOID */ /*----------------------------------------------------------------------*/ /* The division is essentially finished here, we just need to perform
@@ -362,4 +362,4 @@ call EXCEPTION pop %ebx jmp L_exit -#endif PARANOID +#endif /* PARANOID */
arch/i386/math-emu/errors.c +7 -7
@@ -141,7 +141,7 @@if ( partial_status & SW_Zero_Div )printk ("SW: divide by zero\n" );if ( partial_status & SW_Denorm_Op )printk ("SW: denormalized operand\n" );if ( partial_status & SW_Invalid )printk ("SW: invalid operation\n" ); -#endif DEBUGGING +#endif /* DEBUGGING */ printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n", partial_status & 0x8000 ? 1 : 0, /* busy */
@@ -327,7 +327,7 @@#ifdef PRINT_MESSAGES /* My message from the sponsor */ printk (FPU_VERSION " " __DATE__" (C) W. Metzenthen.\n" ); -#endif PRINT_MESSAGES +#endif /* PRINT_MESSAGES */ /* Get a name string for error reporting */ for (i=0 ; exception_names[i].type; i++)
@@ -338,7 +338,7 @@ {#ifdef PRINT_MESSAGES printk ("FP Exception: %s!\n" , exception_names[i].name); -#endif PRINT_MESSAGES +#endif /* PRINT_MESSAGES */ } else printk("FPU emulator: Unknown Exception: 0x%04x!\n", n);
@@ -351,7 +351,7 @@#ifdef PRINT_MESSAGES elseFPU_printall (); -#endif PRINT_MESSAGES +#endif /* PRINT_MESSAGES */ /* * The 80486 generates an interrupt on the next non-control FPU
@@ -363,7 +363,7 @@#ifdef __DEBUG__math_abort (FPU_info,SIGFPE ); -#endif __DEBUG__ +#endif /* __DEBUG__ */ }
@@ -469,7 +469,7 @@ else#ifdef PARANOID if (tagb == TW_NaN) -#endif PARANOID +#endif /* PARANOID */ { signalling = !(b->sigh &0x40000000 ); x = b;
@@ -481,7 +481,7 @@EXCEPTION (EX_INTERNAL |0x113 ); x = &CONST_QNaN; } -#endif PARANOID +#endif /* PARANOID */ if ( (!signalling) || (control_word & CW_Invalid) ) {
arch/i386/math-emu/exception.h +3 -3
@@ -18,7 +18,7 @@#ifndef SW_C1 #include "fpu_emu.h" -#endif SW_C1 +#endif /* SW_C1 */ #define FPU_BUSY Const_(0x8000)/* FPU busy bit (8087 compatibility) */ #define EX_ErrorSummary Const_(0x0080)/* Error summary status */
@@ -48,6 +48,6 @@#define EXCEPTION (x) FPU_exception(x)#endif -#endif __ASSEMBLY__ +#endif /* __ASSEMBLY__ */ -#endif _EXCEPTION_H_ +#endif /* _EXCEPTION_H_ */
arch/i386/math-emu/fpu_asm.h +1 -1
@@ -29,4 +29,4 @@#define SIGL (x) SIGL_OFFSET##(x)#define SIGH (x) 4(x) -#endif _FPU_ASM_H_ +#endif /* _FPU_ASM_H_ */
arch/i386/math-emu/fpu_emu.h +3 -3
@@ -88,7 +88,7 @@#else # define RE_ENTRANT_CHECK_OFF # define RE_ENTRANT_CHECK_ON -#endif RE_ENTRANT_CHECKING +#endif /* RE_ENTRANT_CHECKING */ #define FWAIT_OPCODE 0x9b#define OP_SIZE_PREFIX 0x66
@@ -212,6 +212,6 @@#include "fpu_proto.h" #endif -#endif __ASSEMBLY__ +#endif /* __ASSEMBLY__ */ -#endif _FPU_EMU_H_ +#endif /* _FPU_EMU_H_ */
arch/i386/math-emu/fpu_entry.c +10 -10
@@ -78,7 +78,7 @@ fdivr_, FPU_trigb, __BAD__, __BAD__, fdiv_i, __BAD__, fdivp_, __BAD__, }; -#endif NO_UNDOC_CODE +#endif /* NO_UNDOC_CODE */ #define _NONE_ 0/* Take no special action */
@@ -120,12 +120,12 @@ _REGI_, _NONE_, _null_, _null_, _REGIi, _null_, _REGIp, _null_ }; -#endif NO_UNDOC_CODE +#endif /* NO_UNDOC_CODE */ #ifdef RE_ENTRANT_CHECKING u_char emulating=0 ; -#endif RE_ENTRANT_CHECKING +#endif /* RE_ENTRANT_CHECKING */ static int valid_prefix (u_char *Byte,u_char **fpu_eip,overrides *override);
@@ -152,7 +152,7 @@ printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n"); }RE_ENTRANT_CHECK_ON ; -#endif RE_ENTRANT_CHECKING +#endif /* RE_ENTRANT_CHECKING */ if (!current->used_math) {
@@ -251,7 +251,7 @@#ifdef PARANOID EXCEPTION (EX_INTERNAL |0x128 );math_abort (FPU_info,SIGILL ); -#endif PARANOID +#endif /* PARANOID */ }RE_ENTRANT_CHECK_OFF ;
@@ -386,7 +386,7 @@/* fdiv or fsub */ real_2op_NaN (&loaded_data, loaded_tag,0 , &loaded_data); else -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ /* fadd, fdivr, fmul, or fsubr */ real_2op_NaN (&loaded_data, loaded_tag,0 , st0_ptr); }
@@ -497,7 +497,7 @@to do this: */ operand_address.offset =0 ; operand_address.selector =FPU_DS ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ st0_ptr = &st (0 ); st0_tag =FPU_gettag0 ();
@@ -557,7 +557,7 @@RE_ENTRANT_CHECK_OFF ;FPU_printall ();RE_ENTRANT_CHECK_ON ; -#endif DEBUG +#endif /* DEBUG */ if (FPU_lookahead && !current->need_resched) {
@@ -669,7 +669,7 @@ __asm__("movl %0,%%esp ; ret" : :"g" (((long ) info)-4 ));#ifdef PARANOID printk ("ERROR: wm-FPU-emu math_abort failed!\n" ); -#endif PARANOID +#endif /* PARANOID */ }
@@ -739,7 +739,7 @@S387 ->twd |=0xffff0000 ;S387 ->fcs &= ~0xf8000000 ;S387 ->fos |=0xffff0000 ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ __copy_to_user (d, &S387 ->cwd,7 *4 );RE_ENTRANT_CHECK_ON ;
arch/i386/math-emu/fpu_etc.c +1 -1
@@ -68,7 +68,7 @@/* This is weird! */ if (getsign (st0_ptr) ==SIGN_POS )setcc (SW_C3 ); -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ return ; }break ;
arch/i386/math-emu/fpu_trig.c +16 -16
@@ -98,7 +98,7 @@ q++; } } -#endif BETTER_THAN_486 +#endif /* BETTER_THAN_486 */ }#ifdef BETTER_THAN_486 else
@@ -138,7 +138,7 @@ } } } -#endif BETTER_THAN_486 +#endif /* BETTER_THAN_486 */ FPU_settag0 (st0_tag); control_word = old_cw;
@@ -186,7 +186,7 @@#ifdef PARANOID else EXCEPTION(EX_INTERNAL|0x0112); -#endif PARANOID +#endif /* PARANOID */ }
@@ -232,7 +232,7 @@#ifdef PARANOID default :EXCEPTION (EX_INTERNAL |0x0112 ); -#endif PARANOID +#endif /* PARANOID */ } }
@@ -463,7 +463,7 @@#ifdef PARANOID else EXCEPTION(EX_INTERNAL | 0x119); -#endif PARANOID +#endif /* PARANOID */ }
@@ -716,7 +716,7 @@set_precision_flag_down ();/* 80486 appears to do this. */ #else set_precision_flag_up ();/* Must be up. */ -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ return 0 ; } }
@@ -1008,7 +1008,7 @@setcc (SW_C2 );#else setcc (0 ); -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ return ; } cc =SW_C2 ;
@@ -1114,7 +1114,7 @@#ifdef PARANOID if ( (st0_tag != TW_NaN) && (st1_tag != TW_NaN) )EXCEPTION (EX_INTERNAL |0x118 ); -#endif PARANOID +#endif /* PARANOID */ real_2op_NaN (st1_ptr, st1_tag,0 , st1_ptr);
@@ -1315,7 +1315,7 @@ sign =getsign (st1_ptr);if (FPU_divide_by_zero (1 , sign) <0 )return ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ changesign (st1_ptr); }
@@ -1451,7 +1451,7 @@#ifdef PARANOID else EXCEPTION(EX_INTERNAL | 0x125); -#endif PARANOID +#endif /* PARANOID */ FPU_pop ();set_precision_flag_up ();/* We do not really know if up or down */
@@ -1542,7 +1542,7 @@#ifdef PARANOID EXCEPTION (EX_INTERNAL |0x116 );return ; -#endif PARANOID +#endif /* PARANOID */ } }else if ( (st0_tag == TAG_Valid) || (st0_tag == TW_Denormal) )
@@ -1560,7 +1560,7 @@#else if (arith_invalid (1 ) <0 )return ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ }else if ( (st0_tag == TW_Denormal) && (denormal_operand () <0 ) )return ;
@@ -1583,7 +1583,7 @@changesign (st1_ptr);#else if (arith_invalid (1 ) <0 )return ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ }else if ( (st0_tag == TW_Denormal) && (denormal_operand () <0 ) )return ;
@@ -1618,14 +1618,14 @@/* This should have higher priority than denormals, but... */ if (arith_invalid (1 ) <0 )/* log(-infinity) */ return ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ if ( (st1_tag == TW_Denormal) && (denormal_operand () <0 ) )return ;#ifdef PECULIAR_486 /* Denormal operands actually get higher priority */ if (arith_invalid (1 ) <0 )/* log(-infinity) */ return ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ }else if ( st1_tag == TAG_Zero ) {
@@ -1654,7 +1654,7 @@EXCEPTION (EX_INTERNAL |0x117 ); return; } -#endif PARANOID +#endif /* PARANOID */ FPU_pop ();return ;
arch/i386/math-emu/get_address.c +2 -2
@@ -143,7 +143,7 @@EXCEPTION (EX_INTERNAL |0x130 ); math_abort(FPU_info,SIGSEGV); } -#endif PARANOID +#endif /* PARANOID */ addr->selector =VM86_REG_ (segment);return (unsigned long )VM86_REG_ (segment) <<4 ; }
@@ -166,7 +166,7 @@EXCEPTION (EX_INTERNAL |0x132 ); math_abort(FPU_info,SIGSEGV); } -#endif PARANOID +#endif /* PARANOID */ switch ( segment ) {
arch/i386/math-emu/load_store.c +3 -3
@@ -85,7 +85,7 @@#ifdef PARANOID else EXCEPTION(EX_INTERNAL|0x140); -#endif PARANOID +#endif /* PARANOID */ } switch ( type_table[type] )
@@ -112,7 +112,7 @@default :EXCEPTION (EX_INTERNAL |0x141 );return 0 ; -#endif PARANOID +#endif /* PARANOID */ } switch ( type )
@@ -217,7 +217,7 @@ partial_status &= ~(SW_Summary | SW_Backward);#ifdef PECULIAR_486 control_word |=0x40 ;/* An 80486 appears to always set this bit */ -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ return 1 ;case 025 :/* fld m80real */ clear_C1 ();
arch/i386/math-emu/poly.h +1 -1
@@ -118,4 +118,4 @@ :"=g" (*x):"g" (x):"si","ax","cx"); } -#endif _POLY_H +#endif /* _POLY_H */
arch/i386/math-emu/poly_2xm1.c +1 -1
@@ -67,7 +67,7 @@EXCEPTION (EX_INTERNAL |0x127 ); return 1; } -#endif PARANOID +#endif /* PARANOID */ argSignif.lsw =0 ;XSIG_LL (argSignif) = Xll =significand (arg);
arch/i386/math-emu/poly_atan.c +1 -1
@@ -124,7 +124,7 @@EXCEPTION (EX_INTERNAL |0x104 );/* There must be a logic error */ return; } -#endif PARANOID +#endif /* PARANOID */ argSignif.msw =0 ;/* Make the transformed arg -> 0.0 */ }else
arch/i386/math-emu/poly_l2.c +2 -2
@@ -157,7 +157,7 @@#else if (arith_invalid (1 ) <0 )return 1 ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ }/* 80486 appears to do this */
@@ -243,7 +243,7 @@ /* The argument is too large */ } } -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ arg_signif.lsw = argSignif.lsw;XSIG_LL (arg_signif) =XSIG_LL (argSignif); adj =norm_Xsig (&argSignif);
arch/i386/math-emu/poly_sin.c +3 -3
@@ -199,7 +199,7 @@ {EXCEPTION (EX_INTERNAL |0x150 ); } -#endif PARANOID +#endif /* PARANOID */ }
@@ -224,7 +224,7 @@FPU_copy_to_reg0 (&CONST_QNaN, TAG_Special); return; } -#endif PARANOID +#endif /* PARANOID */ exponent =exponent (st0_ptr);
@@ -392,6 +392,6 @@ {EXCEPTION (EX_INTERNAL |0x151 ); } -#endif PARANOID +#endif /* PARANOID */ }
arch/i386/math-emu/poly_tan.c +1 -1
@@ -66,7 +66,7 @@#ifdef PARANOID if (signnegative (st0_ptr) )/* Can't hack a number < 0.0 */ {arith_invalid (0 );return ; }/* Need a positive number */ -#endif PARANOID +#endif /* PARANOID */ /* Split the problem into two domains, smaller and larger than pi/4 */ if ( (exponent ==0 ) || ((exponent ==-1 ) && (st0_ptr->sigh >0xc90fdaa2 )) )
arch/i386/math-emu/reg_compare.c +4 -4
@@ -136,7 +136,7 @@#ifdef PARANOID if (!(st0_ptr->sigh &0x80000000 ))EXCEPTION (EX_Invalid);if (!(b->sigh &0x80000000 ))EXCEPTION (EX_Invalid); -#endif PARANOID +#endif /* PARANOID */ diff = exp0 - expb;if ( diff ==0 )
@@ -203,7 +203,7 @@EXCEPTION (EX_INTERNAL |0x121 ); f =SW_C3 |SW_C2 |SW_C0 ;break ; -#endif PARANOID +#endif /* PARANOID */ }setcc (f);if (c & COMP_Denormal)
@@ -255,7 +255,7 @@EXCEPTION (EX_INTERNAL |0x122 ); f =SW_C3 |SW_C2 |SW_C0 ;break ; -#endif PARANOID +#endif /* PARANOID */ }setcc (f);if (c & COMP_Denormal)
@@ -312,7 +312,7 @@EXCEPTION (EX_INTERNAL |0x123 ); f =SW_C3 |SW_C2 |SW_C0 ;break ; -#endif PARANOID +#endif /* PARANOID */ }setcc (f);if (c & COMP_Denormal)
arch/i386/math-emu/reg_constant.h +1 -1
@@ -28,4 +28,4 @@extern FPU_REG const CONST_MINF ;extern FPU_REG const CONST_QNaN; -#endif _REG_CONSTANT_H_ +#endif /* _REG_CONSTANT_H_ */
arch/i386/math-emu/reg_divide.c +1 -1
@@ -201,6 +201,6 @@EXCEPTION (EX_INTERNAL |0x102 ); return FPU_Exception; } -#endif PARANOID +#endif /* PARANOID */ }
arch/i386/math-emu/reg_ld_str.c +7 -7
@@ -439,7 +439,7 @@converts to decide underflow. */ if ( !((tmp.sigh ==0x00100000 ) && (tmp.sigl ==0 ) && (st0_ptr->sigl & 0x000007ff)) ) -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ {EXCEPTION (EX_Underflow);/* This is a special case: see sec 16.2.5.1 of
@@ -559,7 +559,7 @@/* Underflow has priority. */ if ( control_word & CW_Underflow )denormal_operand (); -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ reg_copy (st0_ptr, &tmp); goto denormal_arg; }
@@ -659,7 +659,7 @@converts to decide underflow. */ if ( !((tmp.sigl ==0x00800000 ) && ((st0_ptr->sigh & 0x000000ff) || st0_ptr->sigl)) ) -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ {EXCEPTION (EX_Underflow);/* This is a special case: see sec 16.2.5.1 of
@@ -776,7 +776,7 @@/* Underflow has priority. */ if ( control_word & CW_Underflow )denormal_operand (); -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ goto denormal_arg; }else if (st0_tag == TW_Infinity)
@@ -1221,7 +1221,7 @@#ifdef PECULIAR_486 control_word &= ~0xe080 ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ top = (partial_status >> SW_Top_Shift) &7 ;
@@ -1303,7 +1303,7 @@FPU_put_user (control_word & ~0xe080 , (unsigned long *) d);#else FPU_put_user (control_word, (unsigned short *) d); -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ FPU_put_user (status_word (), (unsigned short *) (d+2 ));FPU_put_user (fpu_tag_word, (unsigned short *) (d+4 ));FPU_put_user (instruction_address.offset, (unsigned short *) (d+6 ));
@@ -1335,7 +1335,7 @@ fpu_tag_word |=0xffff0000 ;I387 .soft.fcs &= ~0xf8000000 ;I387 .soft.fos |=0xffff0000 ; -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ __copy_to_user (d, &control_word,7 *4 );RE_ENTRANT_CHECK_ON ; d +=0x1c ;
arch/i386/math-emu/reg_mul.c +1 -1
@@ -126,6 +126,6 @@EXCEPTION (EX_INTERNAL |0x102 ); return FPU_Exception; } -#endif PARANOID +#endif /* PARANOID */ }
arch/i386/math-emu/reg_round.S +14 -14
@@ -100,7 +100,7 @@ .byte 0 FPU_denormal: .byte 0 -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ .text
@@ -126,13 +126,13 @@ #ifndef NON_REENTRANT_FPU pushl %ebx /* adjust the stack pointer */ -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ #ifdef PARANOID /* Cannot use this here yet */ /* orl %eax,%eax */ /* jns L_entry_bugged */ -#endif PARANOID +#endif /* PARANOID */ cmpw EXP_UNDER,EXP(%edi) jle L_Make_denorm /* The number is a de-normal */
@@ -160,12 +160,12 @@ je LRound_To_64 #ifdef PARANOID jmp L_bugged_denorm_486 -#endif PARANOID +#endif /* PARANOID */ #else #ifdef PARANOID jmp L_bugged_denorm /* There is no bug, just a bad control word */ -#endif PARANOID -#endif PECULIAR_486 +#endif /* PARANOID */ +#endif /* PECULIAR_486 */ /* Round etc to 24 bit precision */
@@ -186,7 +186,7 @@ #ifdef PARANOID jmp L_bugged_round24 -#endif PARANOID +#endif /* PARANOID */ LUp_24: cmpb SIGN_POS,PARAM5
@@ -266,7 +266,7 @@ #ifdef PARANOID jmp L_bugged_round53 -#endif PARANOID +#endif /* PARANOID */ LUp_53: cmpb SIGN_POS,PARAM5
@@ -340,7 +340,7 @@ #ifdef PARANOID jmp L_bugged_round64 -#endif PARANOID +#endif /* PARANOID */ LUp_64: cmpb SIGN_POS,PARAM5
@@ -430,7 +430,7 @@ #ifndef NON_REENTRANT_FPU popl %ebx /* adjust the stack pointer */ -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ fpu_Arith_exit: popl %ebx
@@ -570,7 +570,7 @@ /* But check it... just in case. */ cmpw EXP_UNDER+1,EXP(%edi) jne L_norm_bugged -#endif PARANOID +#endif /* PARANOID */ #ifdef PECULIAR_486 /*
@@ -586,7 +586,7 @@ #else orl %eax,%eax /* ms bits */ js L_Normalised /* No longer a denormal */ -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ jnz LDenormal_adj_exponent
@@ -673,7 +673,7 @@ call EXCEPTION popl %ebx jmp L_exception_exit -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ L_bugged_round24: pushl EX_INTERNAL|0x231
@@ -706,4 +706,4 @@ L_exception_exit: mov $-1,%eax jmp fpu_reg_round_special_exit -#endif PARANOID +#endif /* PARANOID */
arch/i386/math-emu/reg_u_add.S +2 -2
@@ -72,7 +72,7 @@ testl $0x80000000,SIGH(%esi) je L_bugged -#endif PARANOID +#endif /* PARANOID */ /* The number to be shifted is in %eax:%ebx:%edx */ cmpw $32,%cx /* shrd only works for 0..31 bits */
@@ -164,4 +164,4 @@ popl %esi leave ret -#endif PARANOID +#endif /* PARANOID */
arch/i386/math-emu/reg_u_div.S +12 -12
@@ -67,7 +67,7 @@ .long 0 FPU_ovfl_flag: .byte 0 -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ #define REGA PARAM1 #define REGB PARAM2
@@ -79,7 +79,7 @@ movl %esp,%ebp #ifndef NON_REENTRANT_FPU subl $28,%esp -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ pushl %esi pushl %edi
@@ -112,7 +112,7 @@ /* je L_bugged */ testl $0x80000000, SIGH(%ebx) /* Divisor */ je L_bugged -#endif PARANOID +#endif /* PARANOID */ /* Check if the divisor can be treated as having just 32 bits */ cmpl $0,SIGL(%ebx)
@@ -248,7 +248,7 @@ #ifdef PARANOID jb L_bugged_1 -#endif PARANOID +#endif /* PARANOID */ /* need to subtract another once of the denom */ incl FPU_result_2 /* Correct the answer */
@@ -261,7 +261,7 @@ #ifdef PARANOID sbbl $0,FPU_accum_3 jne L_bugged_1 /* Must check for non-zero result here */ -#endif PARANOID +#endif /* PARANOID */ /*----------------------------------------------------------------------*/ /* Half of the main problem is done, there is just a reduced numerator
@@ -291,7 +291,7 @@ #ifdef PARANOID je L_bugged_2 /* Can't bump the result to 1.0 */ -#endif PARANOID +#endif /* PARANOID */ LDo_2nd_div: cmpl $0,%ecx /* augmented denom msw */
@@ -314,7 +314,7 @@ #ifdef PARANOID jc L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ movl FPU_result_1,%eax /* Get the result back */ mull SIGL(%ebx) /* now mul the ls dw of the denom */
@@ -325,14 +325,14 @@ #ifdef PARANOID jc L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ jz LDo_3rd_32_bits #ifdef PARANOID cmpl $1,FPU_accum_2 jne L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ /* need to subtract another once of the denom */ movl SIGL(%ebx),%eax
@@ -344,14 +344,14 @@ #ifdef PARANOID jc L_bugged_2 jne L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ addl $1,FPU_result_1 /* Correct the answer */ adcl $0,FPU_result_2 #ifdef PARANOID jc L_bugged_2 /* Must check for non-zero result here */ -#endif PARANOID +#endif /* PARANOID */ /*----------------------------------------------------------------------*/ /* The division is essentially finished here, we just need to perform
@@ -470,4 +470,4 @@ leave ret -#endif PARANOID +#endif /* PARANOID */
arch/i386/math-emu/reg_u_mul.S +4 -4
@@ -40,7 +40,7 @@ .long 0 FPU_accum_1: .long 0 -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ .text
@@ -49,7 +49,7 @@ movl %esp,%ebp #ifndef NON_REENTRANT_FPU subl $8,%esp -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ pushl %esi pushl %edi
@@ -63,7 +63,7 @@ jz L_bugged testl $0x80000000,SIGH(%edi) jz L_bugged -#endif PARANOID +#endif /* PARANOID */ xorl %ecx,%ecx xorl %ebx,%ebx
@@ -144,5 +144,5 @@ popl %esi leave ret -#endif PARANOID +#endif /* PARANOID */
arch/i386/math-emu/reg_u_sub.S +4 -4
@@ -54,7 +54,7 @@ testl $0x80000000,SIGH(%esi) je L_bugged_2 -#endif PARANOID +#endif /* PARANOID */ /*--------------------------------------+ | Form a register holding the |
@@ -165,7 +165,7 @@ #ifdef PARANOID /* We can never get a borrow */ jc L_bugged -#endif PARANOID +#endif /* PARANOID */ /*--------------------------------------+ | Normalize the result |
@@ -199,7 +199,7 @@ #ifdef PARANOID orl %edx,%edx jnz L_bugged_3 -#endif PARANOID +#endif /* PARANOID */ /* The result is zero */ movw $0,EXP(%edi) /* exponent */
@@ -262,7 +262,7 @@ L_error_exit: movl $-1,%eax -#endif PARANOID +#endif /* PARANOID */ L_exit: popl %ebx
arch/i386/math-emu/status_w.h +3 -3
@@ -58,8 +58,8 @@# define clear_C1 () { partial_status &= ~SW_C1; }# else # define clear_C1 () -#endif PECULIAR_486 +#endif /* PECULIAR_486 */ -#endif __ASSEMBLY__ +#endif /* __ASSEMBLY__ */ -#endif _STATUS_H_ +#endif /* _STATUS_H_ */
arch/i386/math-emu/wm_sqrt.S +7 -7
@@ -70,7 +70,7 @@ .long 0 FPU_fsqrt_arg_0: .long 0 /* ls word, at most the ms bit is set */ -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ .text
@@ -79,7 +79,7 @@ movl %esp,%ebp #ifndef NON_REENTRANT_FPU subl $28,%esp -#endif NON_REENTRANT_FPU +#endif /* NON_REENTRANT_FPU */ pushl %esi pushl %edi pushl %ebx
@@ -210,7 +210,7 @@ /* It should be possible to get here only if the arg is ffff....ffff */ cmp $0xffffffff,FPU_fsqrt_arg_1 jnz sqrt_stage_2_error -#endif PARANOID +#endif /* PARANOID */ /* The best rounded result. */ xorl %eax,%eax
@@ -224,7 +224,7 @@ sqrt_stage_2_error: pushl EX_INTERNAL|0x213 call EXCEPTION -#endif PARANOID +#endif /* PARANOID */ sqrt_stage_2_done:
@@ -279,7 +279,7 @@ call EXCEPTION sqrt_stage_3_no_error: -#endif PARANOID +#endif /* PARANOID */ movl FPU_accum_2,%edx movl FPU_accum_1,%eax
@@ -385,7 +385,7 @@ call EXCEPTION sqrt_near_exact_ok: -#endif PARANOID +#endif /* PARANOID */ or %ebx,%ebx js sqrt_near_exact_small
@@ -445,7 +445,7 @@ call EXCEPTION sqrt_more_prec_ok: -#endif PARANOID +#endif /* PARANOID */ or %ebx,%ebx js sqrt_more_prec_small
arch/m68k/ifpsp060/src/fplsp.S +1 -1
@@ -9364,7 +9364,7 @@ # R := X, go to Step 4. # # else # # R := 2^(-L)X, j := L. # -# endif # +# endif /* # */ # # # Step 3. Perform MOD(X,Y) # # 3.1 If R = Y, go to Step 9. #
arch/m68k/ifpsp060/src/fpsp.S +1 -1
@@ -9723,7 +9723,7 @@ # R := X, go to Step 4. # # else # # R := 2^(-L)X, j := L. # -# endif # +# endif /* # */ # # # Step 3. Perform MOD(X,Y) # # 3.1 If R = Y, go to Step 9. #
arch/m68k/kernel/head.S +4 -4
@@ -144,7 +144,7 @@ * --------- * This algorithm will print out the page tables of the system as * appropriate for an 030 or an 040. This is useful for debugging purposes - * and as such is enclosed in #ifdef MMU_PRINT/#endif clauses. + * and as such is enclosed in #ifdef MMU_PRINT/#endif /* clauses. */ * * ###################################################################### *
@@ -152,7 +152,7 @@ * ------------ * The console is also able to be turned off. The console in head.S * is specifically for debugging and can be very useful. It is surrounded by - * #ifdef CONSOLE/#endif clauses so it doesn't have to ship in known-good + * #ifdef CONSOLE/#endif /* clauses so it doesn't have to ship in known-good */ * kernels. It's basic algorithm is to determine the size of the screen * (in height/width and bit depth) and then use that information for * displaying an 8x8 font or an 8x16 (widthxheight). I prefer the 8x8 for
@@ -1569,7 +1569,7 @@ putc '\n' #if 0 /* - * The following #if/#endif block is a tight algorithm for dumping the 040 + * The following #if/#endif /* block is a tight algorithm for dumping the 040 */ * MMU Map in gory detail. It really isn't that practical unless the * MMU Map algorithm appears to go awry and you need to debug it at the * entry per entry level.
@@ -3047,7 +3047,7 @@ moveml %sp@+,%d0-%d7/%a2-%a6 jbra L(serial_putc_done) 2: -#endif CONFIG_MVME16x +#endif /* CONFIG_MVME16x */ #ifdef CONFIG_BVME6000 is_not_bvme6000(2f)
arch/mips/cobalt/int-handler.S +1 -1
@@ -38,7 +38,7 @@ andi t1,t0,STATUSF_IP4 bnez t1,ll_ethernet1_irq -/* #endif */ +/* #endif /* */ */ andi t1,t0,STATUSF_IP6 bnez t1,ll_via_irq andi t1,t0,STATUSF_IP5
arch/parisc/kernel/entry.S +1 -1
@@ -1692,7 +1692,7 @@ ldw IRQSTAT_SI_MASK(%r19),%r19 /* hardirq.h: unsigned int */ and %r19,%r20,%r20 comib,<>,n 0,%r20,syscall_do_softirq /* forward */ -/* #endif */ +/* #endif /* */ */ syscall_check_resched:
arch/ppc/kernel/pmac_setup.c +1 -1
@@ -727,5 +727,5 @@prom_drawstring (s); prom_drawchar('\n'); } -#endif CONFIG_BOOTX_TEXT +#endif /* CONFIG_BOOTX_TEXT */
arch/sparc/kernel/ioport.c +2 -2
@@ -703,7 +703,7 @@ } } } -#endif CONFIG_PCI +#endif /* CONFIG_PCI */ #ifdef CONFIG_PROC_FS
@@ -725,7 +725,7 @@ return p-buf; } -#endif CONFIG_PROC_FS +#endif /* CONFIG_PROC_FS */ /* * This is a version of find_resource and it belongs to kernel/resource.c.
drivers/atm/nicstar.c +1 -1
@@ -793,7 +793,7 @@ u32d[0 ] =NS_RCTE_RAWCELLINTEN ;#else u32d[0 ] =0x00000000 ; -#endif RCQ_SUPPORT +#endif /* RCQ_SUPPORT */ u32d[1 ] =0x00000000 ; u32d[2 ] =0x00000000 ; u32d[3 ] =0xFFFFFFFF ;
drivers/cdrom/sbpcd.c +76 -76
569 lines not on this page · raw message
drivers/char/pcxx.c +1 -1
@@ -122,7 +122,7 @@MODULE_PARM (numports,"1-4i" );# endif -#endif MODULE +#endif /* MODULE */ static int numcards =1 ;static int nbdevs =0 ;
drivers/i2c/i2c-pcf8584.h +1 -1
@@ -75,4 +75,4 @@#define I2C_PCF_INTREG I2C_PCF_ES2#define I2C_PCF_CLKREG I2C_PCF_ES1 -#endif I2C_PCF8584_H +#endif /* I2C_PCF8584_H */
drivers/ide/pdc4030.h +1 -1
@@ -41,4 +41,4 @@ u8 pad[SECTOR_WORDS*4 - 32]; }; -#endif IDE_PROMISE_H +#endif /* IDE_PROMISE_H */
drivers/ide/rz1000.c +1 -1
@@ -94,4 +94,4 @@ init_rz1000 (dev, "RZ1001"); } -#endif CONFIG_BLK_DEV_IDEPCI +#endif /* CONFIG_BLK_DEV_IDEPCI */
drivers/net/3c527.h +1 -1
@@ -37,4 +37,4 @@#define CONTROL_EL 0x40/* End of List */ -#define MCA_MC32_ID 0x0041/* Our MCA ident */ +#define MCA_MC32_ID 0x0041/* Our MCA ident */
drivers/net/myri_code.h +1 -1
@@ -6284,4 +6284,4 @@#define MYRI_NetReceiveBadCrcs 0xB8D4#define MYRI_NetReceiveBytes 0xB8DC -#endif SYMBOL_DEFINES_COMPILED +#endif /* SYMBOL_DEFINES_COMPILED */
drivers/net/pcmcia/i82593.h +1 -1
@@ -221,4 +221,4 @@#define I82593_MAX_MULTICAST_ADDRESSES 128/* Hardware hashed filter */ -#endif _I82593_H +#endif /* _I82593_H */
drivers/net/pcmcia/wavelan_cs.c +3 -3
@@ -22,7 +22,7 @@#ifdef WAVELAN_ROAMING * Roaming support added 07/22/98 by Justin Seger ([email protected]) * based on patch by Joe Finney from Lancaster University. -#endif :-) +#endif /* :-) */ * * Lucent (formerly AT&T GIS, formerly NCR) WaveLAN PCMCIA card: An * Ethernet-like radio transceiver controlled by an Intel 82593 coprocessor.
@@ -1774,7 +1774,7 @@#if WIRELESS_EXT >7 const int BAND_NUM =10 ;/* Number of bands */ int c =0 ;/* Channel number */ -#endif WIRELESS_EXT +#endif /* WIRELESS_EXT */ /* Read the frequency table */ fee_read(base, 0x71 /* frequency table */,
@@ -1792,7 +1792,7 @@ (c < BAND_NUM)) c++; list[i].i = c;/* Set the list index */ -#endif WIRELESS_EXT +#endif /* WIRELESS_EXT */ /* put in the list */ list[i].m = (((freq +24 ) *5 ) +24000L ) *10000 ;
drivers/net/wan/lmc/lmc_media.h +1 -1
@@ -61,4 +61,4 @@ }; -#endif +#endif
drivers/net/wan/lmc/lmc_prot.h +1 -1
@@ -11,4 +11,4 @@ unsigned short lmc_proto_type(lmc_softc_t *sc const, struct skbuff *skb) -#endif +#endif
drivers/sbus/char/aurora.c +1 -1
@@ -701,7 +701,7 @@} sbus_writeb(port->SRER, &bp->r[chip]->r[CD180_SRER]); } -#endif AURORA_BRAIN_DAMAGED_CTS */ +#endif /* AURORA_BRAIN_DAMAGED_CTS */ *//* Clear change bits */ sbus_writeb (0 , &bp->r[chip]->r[CD180_MCR ]);
drivers/scsi/NCR53c406a.c +16 -16
@@ -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 (check_region (port_base,0x10 ))/* ports already snatched */
@@ -510,7 +510,7 @@ } } } -#endif PORT_BASE +#endif /* PORT_BASE */ if (!port_base){/* no ports found */ printk ("NCR53c406a: no available ports found\n" );
@@ -549,7 +549,7 @@#if USE_DMA printk ("NCR53c406a: No interrupts found and DMA mode defined. Giving up.\n" );return 0 ; -#endif USE_DMA +#endif /* USE_DMA */ }else {DEB (printk ("NCR53c406a: Shouldn't get here!\n" ));
@@ -564,7 +564,7 @@ }DEB (printk ("Allocated DMA channel %d\n" , dma_chan)); -#endif USE_DMA +#endif /* USE_DMA */ tpnt->present =1 ; tpnt->proc_name ="NCR53c406a" ;
@@ -804,8 +804,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 );
@@ -824,7 +824,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" );
@@ -869,7 +869,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 */
@@ -884,7 +884,7 @@ } }REG0 ; -#endif USE_PIO +#endif /* USE_PIO */ }break ;
@@ -898,7 +898,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 */
@@ -913,7 +913,7 @@ } }REG0 ; -#endif USE_PIO +#endif /* USE_PIO */ }break ;
@@ -995,7 +995,7 @@ return irq; } -#endif IRQ_LEV +#endif /* IRQ_LEV */ static void chip_init () {
drivers/scsi/dec_esp.c +1 -1
@@ -524,4 +524,4 @@ (char *) KSEG0ADDR((sp->request_buffer)); } -#endif +#endif
drivers/sound/wavfront.c +8 -8
@@ -131,7 +131,7 @@#if OSS_SUPPORT_LEVEL &OSS_SUPPORT_SEQ static int (*midi_load_patch) (int devno,int format,const char *addr,int offs,int count,int pmgr_flag) =NULL ; -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ /* if WF_DEBUG not defined, no run-time debugging messages will be available via the debug flag setting. Given the current
@@ -279,7 +279,7 @@int fx_mididev;/* devno for FX MIDI interface */ #if OSS_SUPPORT_LEVEL &OSS_SUPPORT_SEQ int oss_dev;/* devno for OSS sequencer synth */ -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ char fw_version[2 ];/* major = [0], minor = [1] */ char hw_version[2 ];/* major = [0], minor = [1] */
@@ -2139,7 +2139,7 @@ bender: midi_synth_bender, setup_voice: midi_synth_setup_voice }; -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ #if OSS_SUPPORT_LEVEL &OSS_SUPPORT_STATIC_INSTALL
@@ -2158,7 +2158,7 @@ (void) uninstall_wavefront (); } -#endif OSS_SUPPORT_STATIC_INSTALL +#endif /* OSS_SUPPORT_STATIC_INSTALL */ /***********************************************************************/ /* WaveFront: Linux modular sound kernel installation interface */
@@ -2674,7 +2674,7 @@ &wavefront_oss_load_patch; } -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ /* Turn on Virtual MIDI, but first *always* turn it off, since otherwise consectutive reloads of the driver will
@@ -2852,14 +2852,14 @@ } else { synth_devs[dev.oss_dev] = &wavefront_operations; } -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ if (wavefront_init (1 ) <0 ) { printk (KERN_WARNING LOGNAME "initialization failed.\n");#if OSS_SUPPORT_LEVEL &OSS_SUPPORT_SEQ sound_unload_synthdev (dev.oss_dev); -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ return -1 ; }
@@ -2890,7 +2890,7 @@#if OSS_SUPPORT_LEVEL &OSS_SUPPORT_SEQ sound_unload_synthdev (dev.oss_dev); -#endif OSS_SUPPORT_SEQ +#endif /* OSS_SUPPORT_SEQ */ uninstall_wf_mpu (); }
drivers/sound/yss225.h +1 -1
@@ -20,5 +20,5 @@extern unsigned char coefficients3[404 ]; -#endif __ys225_h__ +#endif /* __ys225_h__ */
drivers/usb/net1080.c +1 -1
@@ -589,7 +589,7 @@ }#ifdef VERBOSE dbg ("no read resubmitted" ); -#endif VERBOSE +#endif /* VERBOSE */ }/*-------------------------------------------------------------------------*/
drivers/usb/serial/keyspan.c +1 -1
@@ -66,7 +66,7 @@#define DEBUG /* #ifdef CONFIG_USB_SERIAL_DEBUG */ #define DEBUG -/* #endif */ +/* #endif /* */ */#include <linux/usb.h> #include "usb-serial.h"
drivers/video/amifb.c +1 -1
@@ -1534,7 +1534,7 @@} return i; } -#endif */ DEBUG */ +#endif /* */ DEBUG */ */ } return -EINVAL; }
include/asm-arm/arch-sa1100/SA-1101.h +1 -1
@@ -143,7 +143,7 @@#define VMCCR_SDTCTest Fld(7,24)/* stale data timeout counter */ #define VMCCR_ForceSelfRef (1<<31)/* Force self refresh */ -#endif LANGUAGE ==C +#endif /* LANGUAGE == C */ /* Update FIFO
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 */
include/asm-ia64/sn/hcl_util.h +1 -1
@@ -21,4 +21,4 @@extern void *device_info_get (devfs_handle_t ); -#endif _ASM_SN_HCL_UTIL_H +#endif /* _ASM_SN_HCL_UTIL_H */
include/asm-ia64/sn/synergy.h +1 -1
@@ -124,4 +124,4 @@/* Temporary defintions for testing: */ -#endif ASM_IA64_SN_SYNERGY_H +#endif /* ASM_IA64_SN_SYNERGY_H */
include/asm-m68k/pgtable.h +1 -1
@@ -160,7 +160,7 @@#define pte_to_swp_entry (pte) ((swp_entry_t) { pte_val(pte) })#define swp_entry_to_pte (x) ((pte_t) { (x).val }) -#endif CONFIG_SUN3 +#endif /* CONFIG_SUN3 */ #endif /* !__ASSEMBLY__ */
include/asm-m68k/sun3-head.h +1 -1
@@ -9,4 +9,4 @@#define FC_SUPERD 5#define FC_CPU 7 -#endif __SUN3_HEAD_H +#endif /* __SUN3_HEAD_H */
include/asm-mips/watch.h +1 -1
@@ -35,4 +35,4 @@if (watch_available) \ __watch_reenable() -#endif __ASM_WATCH_H +#endif /* __ASM_WATCH_H */
include/asm-mips64/smp.h +1 -1
@@ -45,4 +45,4 @@#define NO_PROC_ID (-1) -#endif __ASM_SMP_H +#endif /* __ASM_SMP_H */
include/asm-mips64/sn/mapped_kernel.h +1 -1
@@ -52,4 +52,4 @@#define MAPPED_KERN_RO_TO_K0 (x) PHYS_TO_K0(MAPPED_KERN_RO_TO_PHYS(x))#define MAPPED_KERN_RW_TO_K0 (x) PHYS_TO_K0(MAPPED_KERN_RW_TO_PHYS(x)) -#endif __ASM_SN_MAPPED_KERNEL_H +#endif /* __ASM_SN_MAPPED_KERNEL_H */
include/asm-mips64/watch.h +1 -1
@@ -35,4 +35,4 @@if (watch_available) \ __watch_reenable() -#endif _ASM_WATCH_H +#endif /* _ASM_WATCH_H */
include/asm-ppc/pgtable.h +1 -1
@@ -488,6 +488,6 @@#include <asm-generic/pgtable.h> -#endif __ASSEMBLY__ +#endif /* __ASSEMBLY__ */ #endif /* _PPC_PGTABLE_H */ #endif /* __KERNEL__ */
include/asm-ppc/raven.h +1 -1
@@ -31,5 +31,5 @@extern struct hw_interrupt_type raven_pic;extern int raven_init (void ); -#endif _ASMPPC_RAVEN_H +#endif /* _ASMPPC_RAVEN_H */ #endif /* __KERNEL__ */
include/asm-s390/sigp.h +1 -1
@@ -249,6 +249,6 @@ return ccode; } -#endif __SIGP__ +#endif /* __SIGP__ */
include/asm-sparc64/a.out.h +1 -1
@@ -21,7 +21,7 @@ unsigned int a_drsize; }; -#endif __ASSEMBLY__ +#endif /* __ASSEMBLY__ */ /* Where in the file does the text information begin? */ #define N_TXTOFF (x) (N_MAGIC(x) == ZMAGIC ? 0 : sizeof (struct exec))
include/linux/802_11.h +1 -1
@@ -188,4 +188,4 @@ } -#endif +#endif
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_ */
include/linux/wavefront.h +4 -4
@@ -31,7 +31,7 @@member, which has the same semantics anyway. */ -#endif __GNUC__ +#endif /* __GNUC__ */ /***************************** WARNING ******************************** PLEASE DO NOT MODIFY THIS FILE IN ANY WAY THAT AFFECTS ITS ABILITY TO
@@ -40,11 +40,11 @@#ifndef NUM_MIDIKEYS #define NUM_MIDIKEYS 128 -#endif NUM_MIDIKEYS +#endif /* NUM_MIDIKEYS */ #ifndef NUM_MIDICHANNELS #define NUM_MIDICHANNELS 16 -#endif NUM_MIDICHANNELS +#endif /* NUM_MIDICHANNELS */ /* These are very useful/important. the original wavefront interface was developed on a 16 bit system, where sizeof(int) = 2
@@ -672,4 +672,4 @@#define WFFX_MEMSET 69 -#endif __wavefront_h__ +#endif /* __wavefront_h__ */
net/irda/irnet/irnet.h +2 -2
@@ -375,7 +375,7 @@struct irda_device_info *discoveries;/* Copy of the discovery log */ int disco_index;/* Last read in the discovery log */ int disco_number;/* Size of the discovery log */ -#endif INITIAL_DISCOVERY +#endif /* INITIAL_DISCOVERY */ } irnet_socket;
@@ -450,4 +450,4 @@/* Control channel stuff - allocated in irnet_irda.h */ extern struct irnet_ctrl_channel irnet_events; -#endif IRNET_H +#endif /* IRNET_H */
net/irda/irnet/irnet_irda.c +12 -12
@@ -382,7 +382,7 @@ self->mask =0xffff ;/* For W2k compatibility */ #else DISCOVERY_NOMASK self->mask = irlmp_service_to_hint(S_LAN); -#endif DISCOVERY_NOMASK +#endif /* DISCOVERY_NOMASK */ self->tx_flow =FLOW_START ;/* Flow control from IrTTP */ DEXIT (IRDA_SOCK_TRACE ,"\n" );
@@ -692,7 +692,7 @@/* If we want to receive "stream sockets" */ if (max_sdu_size ==0 ) new->max_data_size =irttp_get_max_seg_size (new->tsap); -#endif STREAM_COMPAT +#endif /* STREAM_COMPAT */ /* Clean up the original one to keep it in listen state */ self->tsap->dtsap_sel = self->tsap->lsap->dlsap_sel =LSAP_ANY ;
@@ -708,7 +708,7 @@* Also, not doing it give IrDA a chance to finish the setup properly * before beeing swamped with packets... */ ppp_output_wakeup (&new->chan); -#endif CONNECT_INDIC_KICK +#endif /* CONNECT_INDIC_KICK */ /* Notify the control channel */ irnet_post_event (new,IRNET_CONNECT_FROM , new->daddr, self->rname);
@@ -738,7 +738,7 @@/* Hum... Is it the right thing to do ? And do we need to send * a connect response before ? It looks ok without this... */ irttp_disconnect_request (self->tsap,NULL ,P_NORMAL ); -#endif FAIL_SEND_DISCONNECT +#endif /* FAIL_SEND_DISCONNECT */ /* Clean up the server to keep it in listen state */ self->tsap->dtsap_sel = self->tsap->lsap->dlsap_sel =LSAP_ANY ;
@@ -788,7 +788,7 @@#ifdef ADVERTISE_HINT /* Register with IrLMP as a service (advertise our hint bit) */ irnet_server.skey =irlmp_register_service (hints); -#endif ADVERTISE_HINT +#endif /* ADVERTISE_HINT */ /* Register with LM-IAS (so that people can connect to us) */ irnet_server.ias_obj =irias_new_object (IRNET_SERVICE_NAME , jiffies);
@@ -823,7 +823,7 @@#ifdef ADVERTISE_HINT /* Unregister with IrLMP */ irlmp_unregister_service (irnet_server.skey); -#endif ADVERTISE_HINT +#endif /* ADVERTISE_HINT */ /* Unregister with LM-IAS */ if (irnet_server.ias_obj)
@@ -995,7 +995,7 @@#ifdef STREAM_COMPAT if (max_sdu_size ==0 ) self->max_data_size =irttp_get_max_seg_size (self->tsap); -#endif STREAM_COMPAT +#endif /* STREAM_COMPAT */ /* At this point, IrLMP has assigned our source address */ self->saddr =irttp_get_saddr (self->tsap);
@@ -1015,7 +1015,7 @@ #else PASS_CONNECT_PACKETS DERROR(IRDA_CB_ERROR, "Dropping non empty packet.\n");kfree_skb (skb);/* Note : will be optimised with other kfree... */ -#endif PASS_CONNECT_PACKETS +#endif /* PASS_CONNECT_PACKETS */ }else kfree_skb (skb);
@@ -1160,7 +1160,7 @@#else ALLOW_SIMULT_CONNECT irnet_disconnect_server (self ,skb );return ; -#endif ALLOW_SIMULT_CONNECT +#endif /* ALLOW_SIMULT_CONNECT */ }/* So : at this point, we have a socket, and it is idle. Good ! */
@@ -1176,7 +1176,7 @@ #else PASS_CONNECT_PACKETS DERROR(IRDA_CB_ERROR, "Dropping non empty packet.\n");kfree_skb (skb);/* Note : will be optimised with other kfree... */ -#endif PASS_CONNECT_PACKETS +#endif /* PASS_CONNECT_PACKETS */ }else kfree_skb (skb);
@@ -1312,7 +1312,7 @@ DEXIT(IRDA_OCB_TRACE, "\n"); } -#endif DISCOVERY_EVENTS +#endif /* DISCOVERY_EVENTS */ /*********************** PROC ENTRY CALLBACKS ***********************/
@@ -1469,7 +1469,7 @@#ifdef CONFIG_PROC_FS /* Remove our /proc file */ remove_proc_entry ("irnet" , proc_irda); -#endif CONFIG_PROC_FS +#endif /* CONFIG_PROC_FS */ /* Remove our IrNET server from existence */ irnet_destroy_server ();
net/irda/irnet/irnet_irda.h +3 -3
@@ -149,7 +149,7 @@ char **, off_t, int); -#endif CONFIG_PROC_FS +#endif /* CONFIG_PROC_FS */ /**************************** VARIABLES ****************************/
@@ -164,6 +164,6 @@/* The /proc/net/irda directory, defined elsewhere... */ #ifdef CONFIG_PROC_FS extern struct proc_dir_entry *proc_irda; -#endif CONFIG_PROC_FS +#endif /* CONFIG_PROC_FS */ -#endif IRNET_IRDA_H +#endif /* IRNET_IRDA_H */
net/irda/irnet/irnet_ppp.c +8 -8
@@ -186,7 +186,7 @@ return done_event; } -#endif INITIAL_DISCOVERY +#endif /* INITIAL_DISCOVERY */ /*------------------------------------------------------------------*/ /*
@@ -221,7 +221,7 @@DEXIT (CTRL_TRACE ,"\n" ); return(strlen(event)); } -#endif INITIAL_DISCOVERY +#endif /* INITIAL_DISCOVERY */ /* Put ourselves on the wait queue to be woken up */ add_wait_queue (&irnet_events.rwait, &wait);
@@ -346,7 +346,7 @@#ifdef INITIAL_DISCOVERY if (ap->disco_number !=-1 ) mask |=POLLIN |POLLRDNORM ; -#endif INITIAL_DISCOVERY +#endif /* INITIAL_DISCOVERY */ DEXIT (CTRL_TRACE ," - mask=0x%X\n" , mask);return mask;
@@ -379,7 +379,7 @@/* This could (should?) be enforced by the permissions on /dev/irnet. */ if (!capable (CAP_NET_ADMIN ))return -EPERM ; -#endif SECURE_DEVIRNET +#endif /* SECURE_DEVIRNET */ /* Allocate a private structure for this IrNET instance */ ap =kmalloc (sizeof (*ap),GFP_KERNEL );
@@ -556,7 +556,7 @@#ifdef SECURE_DEVIRNET if (!capable (CAP_NET_ADMIN ))return -EPERM ; -#endif SECURE_DEVIRNET +#endif /* SECURE_DEVIRNET */ err = -EFAULT ; switch(cmd)
@@ -683,7 +683,7 @@* we get rid of our own buffers */ #ifdef FLUSH_TO_PPP ppp_output_wakeup (&ap->chan); -#endif FLUSH_TO_PPP +#endif /* FLUSH_TO_PPP */ err =0 ;break ;
@@ -811,7 +811,7 @@* go through interruptible_sleep_on() in irnet_find_lsap_sel() * We need to find another way... */ irda_irnet_connect (self); -#endif CONNECT_IN_SEND +#endif /* CONNECT_IN_SEND */ DEBUG (PPP_INFO ,"IrTTP not ready ! (%d-0x%X)\n" , self->ttp_open, (unsigned int ) self->tsap);
@@ -842,7 +842,7 @@/* Blocking packet, ppp_generic will retry later */ return 0; } -#endif BLOCK_WHEN_CONNECT +#endif /* BLOCK_WHEN_CONNECT */ /* Dropping packet, pppd will retry later */ dev_kfree_skb (skb);
net/irda/irnet/irnet_ppp.h +3 -3
@@ -27,8 +27,8 @@* Should be defined in <linux/if_ppp.h> */ #ifndef PPPIOCSLINKNAME #define PPPIOCSLINKNAME _IOW('t', 74, struct ppp_option_data) -#endif PPPIOCSLINKNAME -#endif LINKNAME_IOCTL +#endif /* PPPIOCSLINKNAME */ +#endif /* LINKNAME_IOCTL */ /* PPP hardcore stuff */
@@ -127,4 +127,4 @@ppp_irnet_ioctl }; -#endif IRNET_PPP_H +#endif /* IRNET_PPP_H */
net/irda/qos.c +1 -1
@@ -258,7 +258,7 @@ WARNING(__FUNCTION__ "(), nothing more we can do!\n"); } } -#endif CONFIG_IRDA_DYNAMIC_WINDOW +#endif /* CONFIG_IRDA_DYNAMIC_WINDOW */ }/*
net/khttpd/security.h +1 -1
@@ -9,4 +9,4 @@ char value[32-sizeof(void*)]; /* fill 1 cache-line */ }; -#endif +#endif
Rich Baum wrote:-
Quoted 4 lines
This patch should fix the rest of the warnings about #endif statements when using the 20001225 gcc snapshot. Thanks to Keith Owens for providing a script to automate this process. It got the job done sooner and found warnings to fix for non x86 platforms.
Unfortunately, the script also gets stuff it shouldn't, and in some cases adds comments within the comments, probably causing stuff to stop compiling altogether. Some examples below.
Neil.
Quoted 1 line
+# endif /* # */
[....]
Quoted 4 lines
* appropriate for an 030 or an 040. This is useful for debugging purposes
- * and as such is enclosed in #ifdef MMU_PRINT/#endif clauses.
+ * and as such is enclosed in #ifdef MMU_PRINT/#endif /* clauses. */
*
[...]
Quoted 3 lines
* is specifically for debugging and can be very useful. It is surrounded by
- * #ifdef CONSOLE/#endif clauses so it doesn't have to ship in known-good
+ * #ifdef CONSOLE/#endif /* clauses so it doesn't have to ship in known-good */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Quoted 4 lines · Rich Baum
This patch should fix the rest of the warnings about #endif statements when using the 20001225 gcc snapshot. Thanks to Keith Owens for providing a script to automate this process. It got the job done sooner and found warnings to fix for non x86 platforms.
As reported by Neil Booth, your patch contains errors which do not appear in my patched system using my script. You probably skipped the leading '^' in the regexp. It also turns out that there are a couple of m68k assembler lines which have a trailing '#' which starts a comment on that assembler. So treat '#' as a comment marker as well.
Whatever you used, it was not my script. It should be (with '#' added)
find -type f -name '*.[chS]' | \
xargs perl -lpi -e 's:^(\s*#\s*endif)\s+([^/\s#].*)$:\1\t/* \2 */:;'BTW, until the patch is correct do not bother sending it to Alan Cox or Linus, just to linux-kernel..
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Quoted 13 lines · Keith Owens
Quoted 4 lines · Rich Baum
This patch should fix the rest of the warnings about #endif statements when using the 20001225 gcc snapshot. Thanks to Keith Owens for providing a script to automate this process. It got the job done sooner and found warnings to fix for non x86 platforms.
As reported by Neil Booth, your patch contains errors which do not appear in my patched system using my script. You probably skipped the leading '^' in the regexp. It also turns out that there are a couple of m68k assembler lines which have a trailing '#' which starts a comment on that assembler. So treat '#' as a comment marker as well.
Quoted 8 lines
Whatever you used, it was not my script. It should be (with '#' added)
find -type f -name '*.[chS]' | \ xargs perl -lpi -e 's:^(\s*#\s*endif)\s+([^/\s#].*)$:\1\t/* \2 */:;'BTW, until the patch is correct do not bother sending it to Alan Cox or Linus, just to linux-kernel..
You're right I left off the first ^. From know on I'll just go back to my method of checking my compile logs for errors and manually fixing them. I'll let other people handle non x86 platforms.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/