1. 14 May, 2008 16 commits
  2. 13 May, 2008 8 commits
  3. 12 May, 2008 16 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