1. 15 May, 2008 7 commits
  2. 13 May, 2008 7 commits
  3. 12 May, 2008 26 commits
    • Linus Torvalds's avatar
      Make 'cond_resched()' nullification depend on PREEMPT_BKL · c714a534
      Linus Torvalds authored
      Because it's not correct with a non-preemptable BKL and just causes
      PREEMPT kernels to have longer latencies than non-PREEMPT ones (which is
      obviously not the point of it at all).
      
      Of course, that config option actually got removed as an option earlier,
      so for now this basically disables it entirely, but if BKL preemption is
      ever resurrected it will be a meaningful optimization.  And in the
      meantime, it at least documents the intent of the code, while not doing
      the wrong thing.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c714a534
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 542dafad
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] don't allow demultiplex thread to exit until kthread_stop is called
        [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
        [CIFS]  add local struct inode pointer to cifs_setattr
        [CIFS] cifs_find_tcp_session cleanup
      542dafad
    • Linus Torvalds's avatar
      Fix up 'need_resched()' definition · 9404ef02
      Linus Torvalds authored
      We should not go through the task pointer to get at the thread info,
      since it's usually cheaper to just access the thread info directly.
      
      So don't make the code look up 'current', when we can just use the
      thread info accessor functions directly.  This generally avoids one
      level of indirection and tends to work better together with code that
      also looks at other thread flags (eg preempt_count).
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9404ef02
    • Linus Torvalds's avatar
      2b753a15
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 8d97b849
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits)
        [MIPS] Pb1000: bury the remnants of the PCI code
        [MIPS] Fix build failure in mips oprofile code
        [MIPS] fix warning message on SMP kernels
        [MIPS] markeins: build fix
        [MIPS] ELF handling - use SELFMAG instead of numeric constant
        [MIPS] Get rid of __ilog2
        [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
        [MIPS] XXS1500 code style cleanup
        [MIPS] MTX-1 code style cleanup
        [MIPS] Pb1200/DBAu1200 code style cleanup
        [MIPS] Pb1550 code style cleanup
        [MIPS] Pb1500 code style cleanup
        [MIPS] Pb1100 code style cleanup
        [MIPS] Pb1000 code style cleanup
        [MIPS] DBAu1xx0 code style cleanup
        [MIPS] Alchemy PCI code style cleanup
        [MIPS] Alchemy common code style cleanup
        [MIPS] Alchemy common headers style cleanup
        [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
        [MIPS] msp_hwbutton.c: minor irq handler cleanups
        ...
      8d97b849
    • H. Peter Anvin's avatar
      types: s390: fix #ifdef reversal in <asm-s390/types.h> · 2ccdcfee
      H. Peter Anvin authored
      The #ifdef for the integer types was reversed; the standard pattern in
      these files are:
      
      #ifndef __s390x__
      /* 32-bit code */
      #else
      /* 64-bit code */
      #endif
      
      Stick with the original pattern, but make sure the 32-bit code
      actually comes first!
      
      Reported by Al Viro.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      2ccdcfee
    • Sergei Shtylyov's avatar
    • Thiemo Seufer's avatar
      [MIPS] Fix build failure in mips oprofile code · 005ca9a3
      Thiemo Seufer authored
      This patch fixes a warning-as-error induced build failure of 64bit MIPS
      kernels.
      Signed-off-by: default avatarThiemo Seufer <ths@networkno.de>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      005ca9a3
    • Thiemo Seufer's avatar
      [MIPS] fix warning message on SMP kernels · 83738e30
      Thiemo Seufer authored
      This patch fixes a (harmless) warning message.
      Signed-off-by: default avatarThiemo Seufer <ths@networkno.de>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      83738e30
    • Adrian Bunk's avatar
      [MIPS] markeins: build fix · b01273f1
      Adrian Bunk authored
      This patch fixes the following build errror caused by
      commit 7dffa3c6
      (ntp: handle leap second via timer):
      
      <--  snip  -->
      
      ...
        CC      arch/mips/emma2rh/markeins/setup.o
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
      /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
      make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
      
      <--  snip  -->
      
      [Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
      __initdata]
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      b01273f1
    • Cyrill Gorcunov's avatar
    • Ralf Baechle's avatar
      [MIPS] Get rid of __ilog2 · ddc0d009
      Ralf Baechle authored
      56a6b1eb was a bit too conservative and
      left __ilog2 around which is only used as an internal function for other
      bitops.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ddc0d009
    • Thomas Bogendoerfer's avatar
      [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus · fcd84f2f
      Thomas Bogendoerfer authored
      Only MIPS32 and MIPS64 CPUs implement clz/dclz. Therefore don't export
      __ilog2() for non MIPS32/MIPS64 cpus and use generic __fls bitop code for
      these cpus.
      Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      fcd84f2f
    • Sergei Shtylyov's avatar
      [MIPS] XXS1500 code style cleanup · 7ff83f21
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - remove needless parentheses;
      
      - remove unneeded numeric literal type cast;
      
      - insert spaces between operator and its operands;
      
      - remove excess new lines;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the structure initializer;
      
      - fix typos, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      7ff83f21
    • Sergei Shtylyov's avatar
      [MIPS] MTX-1 code style cleanup · 1ff1a78c
      Sergei Shtylyov authored
      Fix many errors and warnings given by checkpatch.pl:
      
      - space after opening and before closing parentheses;
      
      - use of C99 // comments;
      
      - leading spaces instead of tabs;
      
      - brace not on the same line with 'else' in the 'if' statement;
        statement;
      
      - printk() without KERN_* facility level;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      - including <asm/gpio.h> instead of <linux/gpio.h>.
      
      In addition to these changes, also do the following:
      
      - insert spaces between operator and its operands;
      
      - replace tab between the function type and name with space in
        mtx1_pci_idsel() declaration;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array/structure
        initializers;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      1ff1a78c
    • Sergei Shtylyov's avatar
      [MIPS] Pb1200/DBAu1200 code style cleanup · c3d1d5c8
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - initialization of a 'static' variable to 0;
      
      - space after opening and before closing parentheses;
      
      - missing space between 'for' and opening parenthesis;
      
      - macros with complex values not enclosed in parentheses;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - mention DBAu1200 board in the Makefile;
      
      - replace the group of #include/#ifdef directives by a single
        #include <au1xxx.h> since this header contains the needed stuff;
      
      - properly indent the blocks;
      
      - insert spaces between operator and its operands, remove excess spaces
        there;
      
      - remove needless parentheses and add some for clarity;
      
      - replace numeric literals/expressions with the matching macros;
      
      - remove space after the type cast's closing parenthesis;
      
      - reduce pb1200_setup_cascade() to the single 'return' statement;
      
      - reduce the number of printed empty lines in the so-called CPLD
        workaround;
      
      - remove #undef AU1X00_EXTERNAL_INT since that macro is not defined
        anywhere;
      
      - replace spaces after the macro name with tabs in the #define directives;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typo in the BCSR_RESETS_PWMR1mUX macro's name;
      
      - group all Pb1200 PCMCIA definitions together;
      
      - put the function's result type and name/parameters on the same line;
      
      - insert missing and remove excess new lines;
      
      - make the multi-line comment style consistent with the kernel style
        elsewhere by adding empty first line and/or adding space/asterisk on
        their left side;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - combine some comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c3d1d5c8
    • Sergei Shtylyov's avatar
      [MIPS] Pb1550 code style cleanup · 6afabe6c
      Sergei Shtylyov authored
      Fix a few errors and warnings given by checkpatch.pl:
      
      - macros with complex values not enclosed in parentheses;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - replace numeric literals with the matching macros;
      
      - properly indent the code and the array initializers;
      
      - insert spaces between operator and its operands, also remove excess spaces
        there;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives, also
        sometimes insert space there for better looks;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      6afabe6c
    • Sergei Shtylyov's avatar
      [MIPS] Pb1500 code style cleanup · 2091a17f
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - replace numeric literals/expressions with the matching macros;
      
      - insert spaces between operator and its operands;
      
      - properly indent the code and the array initializers;
      
      - remove useless #if dirctive from board_setup();
      
      - remove needless parentheses;
      
      - remove unneeded type casts;
      
      - remove excess new lines;
      
      - make hexadecimal literals all lower case;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives,
        also sometimes insert space there for better looks;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2091a17f
    • Sergei Shtylyov's avatar
      [MIPS] Pb1100 code style cleanup · be1c3c1e
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - space between asterisk and variable name;
      
      - use of C99 // comments;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - properly indent the code;
      
      - remove space after the type cast's closing parenthesis;
      
      - replace numeric literals/expressions with the matching macros;
      
      - replace spaces after the macro name with tabs in the #define directives,
        and sometimes insert spaces there;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style
        elsewhere by adding empty first line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      be1c3c1e
    • Sergei Shtylyov's avatar
      [MIPS] Pb1000 code style cleanup · 7916c354
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - brace not on the same line with condition in the 'switch' statement;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - using simple_strtol() where strict_strtol() could be used.
      
      In addition to these changes, also do the following:
      
      - properly indent the 'switch' statement;
      
      - remove needless parentheses;
      
      - insert spaces between operator and its operands;
      
      - replace numeric literals/expressions with the matching macros;
      
      - remove useless #if dirctive from board_setup();
      
      - remove unneeded numeric literal type casts;
      
      - remove space after the type cast's closing parenthesis;
      
      - replace spaces after the macro name with tabs in the #define directives, and
        sometimes insert spaces there;
      
      - remove excess new lines;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first/last line;
      
      - combine some comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      7916c354
    • Sergei Shtylyov's avatar
      [MIPS] DBAu1xx0 code style cleanup · abd14cc0
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - macros with complex values not enclosed in parentheses;
      
      - leading spaces instead of tabs;
      
      - printk() without KERN_* facility level;
      
      - using simple_strtol() where strict_strtol() could be used;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - initialize variable instead of assigning value later where it makes sense;
      
      - insert spaces between operator and its operands, also remove excess spaces
        there;
      
      - remove unneeded numeric literal type casts;
      
      - remove needless parentheses;
      
      - remove space after the type cast's closing parenthesis;
      
      - insert missing space before closing brace in the array initializers;
      
      - replace spaces after the macro name with tabs in the #define directives;
      
      - remove excess tabs after the macro name in the #define directives;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first/last line;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      abd14cc0
    • Sergei Shtylyov's avatar
      [MIPS] Alchemy PCI code style cleanup · a9633279
      Sergei Shtylyov authored
      Fix 15 errors and 4 warnings given by checkpatch.pl:
      
      - space between the asterisk and variable name;
      
      - space after opening and before closing parentheses;
      
      - leading spaces instead of tabs;
      
      - printk() without KERN_* facility level;
      
      - unnecessary braces for single-statement block;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - combine the nested 'if' statements into one when possible;
      
      - remove needless parentheses;
      
      - add missing and remove excess spaces between operator and its operands;
      
      - fix printk() format specifiers mismatching the argument types;
      
      - put the function's result type and name/parameters on the same line;
      
      - insert missing and remove excess new lines;
      
      - properly indent multi-line expressions;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line;
      
      - fix typos, capitalize acronyms, etc. in the comments;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's old email address...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a9633279
    • Sergei Shtylyov's avatar
      [MIPS] Alchemy common code style cleanup · c1dcb14e
      Sergei Shtylyov authored
      Fix many errors and warnings given by checkpatch.pl:
      
      - use of C99 // comments;
      
      - missing space between the type and asterisk in a variable declaration;
      
      - space between the asterisk and function/variable name;
      
      - leading spaces instead of tabs;
      
      - space after opening and before closing parentheses;
      
      - initialization of a 'static' variable to 0;
      
      - missing spaces around assignement/comparison operator;
      
      - brace not on the same line with condition (or 'else') in the 'if'/'switch'
        statement;
      
      - missing space between 'if'/'for'/'while' and opening parenthesis;
      
      - use of assignement in 'if' statement's condition;
      
      - printk() without KERN_* facility level;
      
      - EXPORT_SYMBOL() not following its function immediately;
      
      - unnecessary braces for single-statement block;
      
      - adding new 'typedef' (where including <linux/types.h> will do);
      
      - use of 'extern' in the .c file (where it can be avoided by including header);
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - insert missing space after opening brace and/or before closing brace in the
        structure initializers;
      
      - insert spaces between operator and its operands;
      
      - put the function's result type and name/parameters on the same line;
      
      - properly indent multi-line expressions;
      
      - remove commented out code;
      
      - remove useless initializers and code;
      
      - remove needless parentheses;
      
      - fix broken/excess indentation;
      
      - add missing spaces between operator and its operands;
      
      - insert missing and remove excess new lines;
      
      - group 'else' and 'if' together where possible;
      
      - make au1xxx_platform_init() 'static';
      
      - regroup variable declarations in pm_do_freq() for prettier look;
      
      - replace numeric literals with the matching macros;
      
      - fix printk() format specifiers mismatching the argument types;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line and/or adding space on their left side;
      
      - make two-line comments that only have one line of text one-line;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - fix/remove obsolete references in the comments;
      
      - reformat some comments;
      
      - add comment about the CPU:counter clock ratio to calc_clock();
      
      - update MontaVista copyright;
      
      - remove Pete Popov's and Steve Longerbeam's old email addresses...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c1dcb14e
    • Sergei Shtylyov's avatar
      [MIPS] Alchemy common headers style cleanup · ff6814d5
      Sergei Shtylyov authored
      Fix several errors and warnings given by checkpatch.pl:
      
      - space after opening and before closing parentheses;
      
      - opening brace following 'struct' not on the same line;
      
      - leading spaces instead of tabs;
      
      - use of C99 // comments;
      
      - macros with complex values not enclosed in parentheses;
      
      - missing space between the type and asterisk in a variable declaration;
      
      - space between asterisk and function name;
      
      - including <asm/io.h> instead of <linux/io.h> and <asm/irq.h> instead of
        <linux/irq.h>;
      
      - use of '__inline__' instead of 'inline';
      
      - space between function name and opening parenthesis;
      
      - line over 80 characters.
      
      In addition to these changes, also do the following:
      
      - remove needless parentheses;
      
      - insert spaces between operator and its operands;
      
      - replace spaces after the macro name with tabs in the #define directives and
        after the type in the structure field declarations;
      
      - remove excess tabs after the macro name in the #define directives and in the
        'extern' variable declarations;
      
      - remove excess spaces between # and define for the SSI_*_MASK macros to align
        with other such macros;
      
      - put '||' operator on the same line with its first operand;
      
      - properly indent multi-line function prototypes;
      
      - make the multi-line comment style consistent with the kernel style elsewhere
        by adding empty first line and/or adding space/asterisk on their left side;
      
      - make two-line comments that only have one line of text one-line;
      
      - convert the large multi-line comment in au1xxx_ide.h into several one-liners,
        replace spaces with tabs there;
      
      - fix typos/errors, capitalize acronyms, etc. in the comments;
      
      - insert missing and remove excess new lines;
      
      - update MontaVista copyright;
      
      - remove Pete Popov's and Steve Longerbeam's old email addresses...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ff6814d5
    • Ralf Baechle's avatar
      [MIPS] Add empty argument parenthesis to GCC_IMM_ASM · ad1d77a3
      Ralf Baechle authored
      This is to clarify that GCC_IMM_ASM does not take an argument as the
      context of the macro's invocation seems to imply.
      
      As suggested by Maciej W. Rozycki (macro@linux-mips.org).
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ad1d77a3
    • Jeff Garzik's avatar
      [MIPS] msp_hwbutton.c: minor irq handler cleanups · 1c9e919f
      Jeff Garzik authored
      - remove always-true test
      
      - neaten request_irq() indentation
      
      This change's main purpose is to prepare for the patchset in
      jgarzik/misc-2.6.git#irq-remove, that explores removal of the
      never-used 'irq' argument in each interrupt handler.
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      1c9e919f