1. 12 May, 2008 24 commits
    • 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
    • Adrian Bunk's avatar
      [MIPS] unexport __kmap_atomic_to_page · a6406304
      Adrian Bunk authored
      This patch removes the no longer used export of __kmap_atomic_to_page.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a6406304
    • Ralf Baechle's avatar
      [MIPS] Initialize max_pfn again. · dc3bf353
      Ralf Baechle authored
      This was dropped by
      
      commit a0d9e2d891e4cf54676c430da63bd4a17d1cdb80 (lmo)
      commit b6f1f0de (ko)
      Author: Franck Bui-Huu <vagabon.xyz@gmail.com>
      Date:   Fri Aug 11 17:51:48 2006 +0200
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      dc3bf353
    • Ralf Baechle's avatar
      [MIPS] IRIX: Handle do_brk() error return correctly. · f4324f3e
      Ralf Baechle authored
      do_brk's return value was stored in an unsigned long variable before being
      tested for less than zero making the test always fail.  Also do_brk's
      called irix_map_prda_page wasn't forwarding do_brk() success.
      
      Bug checking the return value of do_brk() and initial fix for it found
      by Roel Kluin <12o3l@tiscali.nl>.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f4324f3e
    • Kevin D. Kissell's avatar
    • Ralf Baechle's avatar
      [MIPS] Don't use max_pfn which is no longer initialized these days. · 9f2546ad
      Ralf Baechle authored
      Still won't play nicely with esotheric configurations such as discontig
      memory ...
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      9f2546ad
    • Roel Kluin's avatar
    • Kevin D. Kissell's avatar
    • Sergei Shtylyov's avatar
      [MIPS] Alchemy: SMBus resource fix · 8e07c2c6
      Sergei Shtylyov authored
      The Alchemy platform code registers the SMBus device using the virtual
      address of its registers instead of the physical one -- fix this, taking
      into account that actually the whole megabyte is decoded by any of the
      programmable serial controllers (one of which is SMBus), and that all the
      Alchemy peripherals are directly mappable into KSEG1 kernel space and
      therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8e07c2c6
    • Linus Torvalds's avatar
      Linux 2.6.26-rc2 · 492c2e47
      Linus Torvalds authored
      492c2e47
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 57014123
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Convert some more new-style drivers to use module aliasing
        i2c: Match dummy devices by type
        i2c-sibyte: Mark i2c_sibyte_add_bus() as static
        i2c-sibyte: Correct a comment about frequency
        i2c: Improve the functionality documentation
        i2c: Improve smbus-protocol documentation
        i2c-piix4: Blacklist two mainboards
        i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
        i2c-mpc: Compare to NO_IRQ instead of zero
      57014123
  2. 11 May, 2008 16 commits
    • Linus Torvalds's avatar
      Add new 'cond_resched_bkl()' helper function · c3921ab7
      Linus Torvalds authored
      It acts exactly like a regular 'cond_resched()', but will not get
      optimized away when CONFIG_PREEMPT is set.
      
      Normal kernel code is already preemptable in the presense of
      CONFIG_PREEMPT, so cond_resched() is optimized away (see commit
      02b67cc3 "sched: do not do
      cond_resched() when CONFIG_PREEMPT").
      
      But when wanting to conditionally reschedule while holding a lock, you
      need to use "cond_sched_lock(lock)", and the new function is the BKL
      equivalent of that.
      
      Also make fs/locks.c use it.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c3921ab7
    • Jean Delvare's avatar
      i2c: Convert some more new-style drivers to use module aliasing · ae429083
      Jean Delvare authored
      Update 3 more new-style i2c drivers to use standard module aliasing
      instead of the old driver_name/type driver matching scheme. These
      video drivers aren't used yet so converting them is trivial.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      ae429083
    • Jean Delvare's avatar
      i2c: Match dummy devices by type · 60b129d7
      Jean Delvare authored
      As the old driver_name/type matching scheme is going away soon, change
      the dummy device mechanism to use the new matching scheme.
      
      This has the downside that dummy i2c clients can no longer choose
      their name, they'll all appear as "dummy" in sysfs and in log
      messages. I don't think it is a problem in practice though, as there
      is little reason to use these i2c clients to log messages.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      60b129d7
    • Maciej W. Rozycki's avatar
      i2c-sibyte: Mark i2c_sibyte_add_bus() as static · b11a9d83
      Maciej W. Rozycki authored
      The i2c_sibyte_add_bus() function is not called, nor meant to, from 
      outside, so mark it as static; fixing a sparse warning too.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      b11a9d83
    • Maciej W. Rozycki's avatar
      i2c-sibyte: Correct a comment about frequency · b3eb5a0b
      Maciej W. Rozycki authored
      The frequency may have been once hardcoded to 100 kHz, but currently it is
      passed as an argument to i2c_sibyte_add_bus(), so update the comment to
      match code.  While at it, reformat a nearby comment for consistency.  No
      functional changes.
      Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      b3eb5a0b
    • Jean Delvare's avatar
      i2c: Improve the functionality documentation · 88b28328
      Jean Delvare authored
      Attempt to make the documentation about the I2C/SMBus functionality
      checking API clearer.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      88b28328
    • David Brownell's avatar
      i2c: Improve smbus-protocol documentation · 1a31a88f
      David Brownell authored
      Improve the smbus-protocol documentation file somewhat:
      
       - Use the names of the SMBus protocol operations (from the 2.0
         specification), not made-up-for-Linux names.
      
       - Add the name of the call used to execute each operation ... and
         point out that there are mismatches, where functions execute
         different protocol operations than their names specify.
         
      The most confusing examples are that "Read Byte" isn't executed by
      i2c_smbus_read_byte(), and that "Write Byte" isn't executed by
      i2c_smbus_write_byte().  When coding, that's not as bad as it may
      seem; but that case would seem to be worth fixing.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      1a31a88f
    • Jean Delvare's avatar
      i2c-piix4: Blacklist two mainboards · c2fc54fc
      Jean Delvare authored
      We had a report that running sensors-detect on a Sapphire AM2RD790
      motherbord killed the CPU. While the exact cause is still unknown,
      I'd rather play it safe and prevent any access to the SMBus on that
      machine by not letting the i2c-piix4 driver attach to the SMBus host
      device on that machine. Also blacklist a similar board made by DFI.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      c2fc54fc
    • David Milburn's avatar
      i2c-piix4: Increase the intitial delay for the ServerWorks CSB5 · b1c1759c
      David Milburn authored
      Per the PIIX4 errata, there maybe a delay between setting the
      start bit in the Smbus Host Controller Register and the transaction
      actually starting. If the driver doesn't delay long enough, it
      may appear that the transaction is complete when actually it
      hasn't started, this may lead to bus collisions.
      
      While 1 ms appears to be enough for most chips, the ServerWorks CSB5
      wants 2 ms.
      Signed-off-by: default avatarDavid Milburn <dmilburn@redhat.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      b1c1759c
    • Jon Smirl's avatar
      i2c-mpc: Compare to NO_IRQ instead of zero · f5fff360
      Jon Smirl authored
      Alter the mpc i2c driver to use the NO_IRQ symbol instead of the constant
      zero when checking for valid interrupts. NO_IRQ=-1 on ppc and NO_IRQ=0 on
      powerpc so the checks against zero are not correct.
      Signed-off-by: default avatarJon Smirl <jonsmirl@gmail.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      f5fff360
    • Bernhard Beck's avatar
      usb-serial: Add ThinkOptics WavIT · 96623697
      Bernhard Beck authored
      Add ThinkOptics WavIt to cp2101 device table
      Signed-off-by: default avatarBernhard Beck <kernel@goodcoffee.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      96623697
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 854a9895
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Fix debugger syscall restart interactions.
        sparc: Fix ptrace() detach.
        sparc32: Don't twiddle PT_DTRACE in exec.
        sparc video: remove open boot prom code
      854a9895
    • Linus Torvalds's avatar
      633331f3
    • David S. Miller's avatar
      sparc: Fix debugger syscall restart interactions. · 28e61036
      David S. Miller authored
      So, forever, we've had this ptrace_signal_deliver implementation
      which tries to handle all of the nasties that can occur when the
      debugger looks at a process about to take a signal.  It's meant
      to address all of these issues inside of the kernel so that the
      debugger need not be mindful of such things.
      
      Problem is, this doesn't work.
      
      The idea was that we should do the syscall restart business first, so
      that the debugger captures that state.  Otherwise, if the debugger for
      example saves the child's state, makes the child execute something
      else, then restores the saved state, we won't handle the syscall
      restart properly because we lose the "we're in a syscall" state.
      
      The code here worked for most cases, but if the debugger actually
      passes the signal through to the child unaltered, it's possible that
      we would do a syscall restart when we shouldn't have.
      
      In particular this breaks the case of debugging a process under a gdb
      which is being debugged by yet another gdb.  gdb uses sigsuspend
      to wait for SIGCHLD of the inferior, but if gdb itself is being
      debugged by a top-level gdb we get a ptrace_stop().  The top-level gdb
      does a PTRACE_CONT with SIGCHLD to let the inferior gdb see the
      signal.  But ptrace_signal_deliver() assumed the debugger would cancel
      out the signal and therefore did a syscall restart, because the return
      error was ERESTARTNOHAND.
      
      Fix this by simply making ptrace_signal_deliver() a nop, and providing
      a way for the debugger to control system call restarting properly:
      
      1) Report a "in syscall" software bit in regs->{tstate,psr}.
         It is set early on in trap entry to a system call and is fully
         visible to the debugger via ptrace() and regsets.
      
      2) Test this bit right before doing a syscall restart.  We have
         to do a final recheck right after get_signal_to_deliver() in
         case the debugger cleared the bit during ptrace_stop().
      
      3) Clear the bit in trap return so we don't accidently try to set
         that bit in the real register.
      
      As a result we also get a ptrace_{is,clear}_syscall() for sparc32 just
      like sparc64 has.
      
      M68K has this same exact bug, and is now the only other user of the
      ptrace_signal_deliver hook.  It needs to be fixed in the same exact
      way as sparc.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      28e61036
    • David S. Miller's avatar
      sparc: Fix ptrace() detach. · 986bef85
      David S. Miller authored
      Forever we had a PTRACE_SUNOS_DETACH which was unconditionally
      recognized, regardless of the personality of the process.
      
      Unfortunately, this value is what ended up in the GLIBC sys/ptrace.h
      header file on sparc as PTRACE_DETACH and PT_DETACH.
      
      So continue to recognize this old value.  Luckily, it doesn't conflict
      with anything we actually care about.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      986bef85
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 5bb7ff79
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier.
        [ARM] Orion: clean up addr-map.c after window setting code purge
        [ARM] Orion: pass proper t_clk into mv643xx_eth
        [ARM] Orion: use mv643xx_eth driver mbus window handling
        [ARM] pxa: Fix RCSR handling
        [ARM] lubbock: fix compilation
        [ARM] 5032/1: Added cpufreq support for pxa27x CPU
        [ARM] 5031/1: Indentation correction in cpu-pxa.c.
        [ARM] 5028/1: pxafb: fix broken "backward compatibility way" in framebuffer
        [ARM] 4882/2: Correction for S3C2410 clkout generation
        [ARM] 5027/1: Fixed random memory corruption on pxa suspend cycle.
        [ARM] 5024/1: Fix some minor clk issues in the MMCI PL18x driver
        [ARM] 5023/1: Fix broken gpio interrupts on ep93xx
        ns9xxx: fix sparse warning
        ns9xxx: check for irq lockups
        ns9xxx: fix handle_prio_irq to unmask irqs with lower priority
      5bb7ff79