Permalink
Switch branches/tags
Commits on Apr 28, 2008
  1. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    torvalds committed Apr 28, 2008
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
      [MIPS] Pb1200/DBAu1200: move platform code to its proper place
      [MIPS] Fix handling of trap and breakpoint instructions
      [MIPS] Pb1200: do register SMC 91C111
      [MIPS] DBAu1200: fix bad SMC 91C111 resource size
      [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
      [MIPS] IP27: Fix build bug due to missing include
      [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
      [MIPS] cevt-gt641xx: Kill unnecessary include
      [MIPS] DS1287: Add clockevent driver
      [MIPS] add DECstation I/O ASIC clocksource
      [MIPS] rbtx4938: minor cleanup
      [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
      [MIPS] rbtx4938: misc cleanups
      [MIPS] jmr3927: use generic txx9 gpio
      [MIPS] rbhma4500: use generic txx9 gpio
      [MIPS] generic txx9 gpio support
      [MIPS] make fallback gpio.h gpiolib-friendly
      [MIPS] unexport null_perf_irq() and make it static
      [MIPS] unexport rtc_mips_set_time()
      [MIPS] unexport copy_from_user_page()
      ...
  2. x86: Fix 32-bit MSI-X allocation leakage

    PJ Waskiewicz committed with torvalds Apr 26, 2008
    This bug was introduced in the 2.6.24 i386/x86_64 tree merge, where
    MSI-X vector allocation will eventually fail.  The cause is the new
    bit array tracking used vectors is not getting cleared properly on
    IRQ destruction on the 32-bit APIC code.
    
    This can be seen easily using the ixgbe 10 GbE driver on multi-core
    systems by simply loading and unloading the driver a few times.
    Depending on the number of available vectors on the host system, the
    MSI-X allocation will eventually fail, and the driver will only be
    able to use legacy interrupts.
    
    I am generating the same patch for both stable trees for 2.6.24 and
    2.6.25.
    
    Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. docbook: fix bitops fatal filename error

    Randy Dunlap committed with torvalds Apr 28, 2008
    bitops source file was renamed, so fix docbook for that.
    docproc: linux-2.6.25-git11/include/asm-x86/bitops_32.h: No such file or directory
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 28, 2008
    …/git/jmorris/selinux-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
      SELinux: Fix a RCU free problem with the netport cache
      SELinux: Made netnode cache adds faster
      SELinux: include/security.h whitespace, syntax, and other cleanups
      SELinux: policydb.h whitespace, syntax, and other cleanups
      SELinux: mls_types.h whitespace, syntax, and other cleanups
      SELinux: mls.h whitespace, syntax, and other cleanups
      SELinux: hashtab.h whitespace, syntax, and other cleanups
      SELinux: context.h whitespace, syntax, and other cleanups
      SELinux: ss/conditional.h whitespace, syntax, and other cleanups
      SELinux: selinux/include/security.h whitespace, syntax, and other cleanups
      SELinux: objsec.h whitespace, syntax, and other cleanups
      SELinux: netlabel.h whitespace, syntax, and other cleanups
      SELinux: avc_ss.h whitespace, syntax, and other cleanups
    
    Fixed up conflict in include/linux/security.h manually
  5. usb input endianness annotations and fixes

    Al Viro committed with torvalds Apr 28, 2008
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. celleb_scc_pciex __iomem annotations

    Al Viro committed with torvalds Apr 28, 2008
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. drivers/usb annotations and fixes

    Al Viro committed with torvalds Apr 28, 2008
    * endianness annotations
    * endianness fixes
    * missing get_unaligned/put_unaligned
    
    It's pretty much all over the place, changes to different files are independent.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Serial-parts-Acked-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. usbhid endianness annotations and fixes

    Al Viro committed with torvalds Apr 28, 2008
    usb_control_msg() converts arguments to little-endian itself,
    doing that in caller means breakage on big-endian boxen.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. q40ide breakage

    Al Viro committed with torvalds Apr 28, 2008
    again, fallout from ide merge
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. typo in sata_fsl

    Al Viro committed with torvalds Apr 28, 2008
    it's ata_link, not ata_linke
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. more icside breakage (from next ide merge)

    Al Viro committed with torvalds Apr 28, 2008
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. fix ia64 local_irq_save() et.al.

    Al Viro committed with torvalds Apr 28, 2008
    psr is not a good name for local variable in macro body when it
    has a good chance of being the argument of said macro (actually
    is at least in one place)
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. ia64 kvm fixes for O=... builds

    Al Viro committed with torvalds Apr 28, 2008
    * EXTRA_CFLAGS do not apply for *.S
    * don't bother with symlinks to ../lib/mem*.S, just add ../lib/mem*.o
      to object list
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. frv si_addr annotations

    Al Viro committed with torvalds Apr 28, 2008
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds committed Apr 28, 2008
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc: video drivers: add facility level
      sparc: tcx.c make tcx_init and tcx_exit static
      sparc: ffb.c make ffb_init and ffb_exit static
      sparc: cg14.c make cg14_init and cg15_exit static
      sparc: bw2.c fix bw2_exit
      sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
      sparc64: Clean up handling of pt_regs trap type encoding.
      sparc: Remove old style signal frame support.
      sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
      sparc: sunzilog.c remove unused argument
      sparc: fix drivers/video/tcx.c warning
      sparc64: Kill unused local ISA bus layer.
      input: Rewrite sparcspkr device probing.
      sparc64: Do not ignore 'pmu' device ranges.
      sparc64: Kill ISA_FLOPPY_WORKS code.
      sparc64: Kill CONFIG_SPARC32_COMPAT
      sparc64: Cleanups and corrections for arch/sparc64/Kconfig
      sparc64: Fix wedged irq regression.
  16. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Apr 28, 2008
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      iwlwifi: Allow building iwl3945 without iwl4965.
      wireless: Fix compile error with wifi & leds
      tcp: Fix slab corruption with ipv6 and tcp6fuzz
      ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
      [IPSEC]: Use digest_null directly for auth
      sunrpc: fix missing kernel-doc
      can: Fix copy_from_user() results interpretation
      Revert "ipv6: Fix typo in net/ipv6/Kconfig"
      tipc: endianness annotations
      ipv6: result of csum_fold() is already 16bit, no need to cast
      [XFRM] AUDIT: Fix flowlabel text format ambibuity.
  17. make CC_OPTIMIZE_FOR_SIZE non-experimental

    Ingo Molnar committed with torvalds Apr 27, 2008
    this option has been the default on a wide range of distributions
    for a long time - time to make it non-experimental.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

    torvalds committed Apr 28, 2008
    * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
      hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ
  19. [MIPS] Pb1200/DBAu1200: move platform code to its proper place

    Sergei Shtylyov committed with ralfbaechle Apr 28, 2008
    Since both the IDE interface and SMC 91C111 Ethernet chip are on-board
    devices, not SOC devices, move the platform device registration form the
    common to the board specific code.
    
    While at it, remove semicolon (which didn't break compilation only by
    chance) from the AU1XXX_ATA_DDMA_REQ macro and do some renaming:
    
    - change 'au1200_ide0_' variable name prefix to the mere 'ide_';
    
    - change 'smc91x_' variable name prefix to 'smc91c111_' since that's the
      name of the chip used on the boards;
    
    - drop 'AU1XXX_' prefix from the names of macros describing IDE and Ethernet
      on-board devices;
    
    - change 'SMC91111_' to 'SMC91C111_', change 'IRQ' to 'INT' in the names of
      the macros describing the Ethernet chip for consistency with the IDE
      macros;
    
    - change 'ATA_' to 'IDE_' and 'OFFSET' to 'SHIFT' (since this value is
      indeed a shift count) in the names of the macros describing the IDE
      interface.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  20. [MIPS] Fix handling of trap and breakpoint instructions

    ralfbaechle committed Apr 20, 2008
    With fixes and cleanups from Atsushi Nemoto (anemo@mba.ocn.ne.jp).
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  21. [MIPS] Pb1200: do register SMC 91C111

    Sergei Shtylyov committed with ralfbaechle Apr 15, 2008
    Pb1200 does have SMC 91C111 Ethernet chip on board but the platform code
    did not register it, so one couldn't mount NFS...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  22. [MIPS] DBAu1200: fix bad SMC 91C111 resource size

    Sergei Shtylyov committed with ralfbaechle Apr 15, 2008
    The on-board SMC 91C111 chip only decodes 16 bytes of memory (obviously, it
    can not decode a whole megabyte starting from address 0x19000300).
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  23. [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532

    ralfbaechle committed Apr 28, 2008
    The platform is actually named routerboard 532 so let's call it this.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Acked-by: Jeff Garzik <jeff@garzik.org>
  24. [MIPS] IP27: Fix build bug due to missing include

    Adrian Bunk committed with ralfbaechle Apr 23, 2008
    asm-mips/mach-ip27/topology.h must #include <asm-generic/topology.h>
    This fixes the following compile error:
    
    ...
      CC      kernel/sched.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'find_next_best_node':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: implicit declaration of function 'node_to_cpumask_ptr'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: '__tmp__' undeclared (first use in this function)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: (Each undeclared identifier is reported only once
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: for each function it appears in.)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'sched_domain_node_span':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7047: error: 'nodemask' undeclared (first use in this function)
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7048: warning: ISO C90 forbids mixed declarations and code
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7059: error: implicit declaration of function 'node_to_cpumask_ptr_next'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function '__build_sched_domains':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7605: error: 'pnodemask' undeclared (first use in this function)
    make[2]: *** [kernel/sched.o] Error 1
    
    <--  snip  -->
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  25. [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c

    Atsushi Nemoto committed with ralfbaechle Apr 25, 2008
    * Declare board_bind_eic_interrupt, board_watchpoint_handler in traps.h
    * Make msc_bind_eic_interrupt static and fix its argument types.
    * Make msc_levelirq_type, msc_edgeirq_type static.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  26. [MIPS] cevt-gt641xx: Kill unnecessary include

    Atsushi Nemoto committed with ralfbaechle Apr 24, 2008
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  27. [MIPS] DS1287: Add clockevent driver

    Yoichi Yuasa committed with ralfbaechle Apr 25, 2008
    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  28. [MIPS] add DECstation I/O ASIC clocksource

    Yoichi Yuasa committed with ralfbaechle Apr 24, 2008
    Add DECstation I/O ASIC clocksource
    
    Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  29. [MIPS] rbtx4938: minor cleanup

    Atsushi Nemoto committed with ralfbaechle Apr 22, 2008
    Do not initialize res->parent for platform device.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  30. [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro

    Sergei Shtylyov committed with ralfbaechle Apr 22, 2008
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  31. [MIPS] rbtx4938: misc cleanups

    Atsushi Nemoto committed with ralfbaechle Apr 14, 2008
    * Do not use non-standard I/O accessors, such as reg_rd08, etc.
    * Kill unnecessary wbflush()
    * Kill tx4938_mips.h
    * Kill unnecessary includes
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  32. [MIPS] jmr3927: use generic txx9 gpio

    Atsushi Nemoto committed with ralfbaechle Apr 4, 2008
    Use generic txx9 gpio (and gpiolib) for JMR3927 board.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  33. [MIPS] rbhma4500: use generic txx9 gpio

    Atsushi Nemoto committed with ralfbaechle Apr 4, 2008
    Use generic txx9 gpio (and gpiolib) for RBHMA4500 board.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  34. [MIPS] generic txx9 gpio support

    Atsushi Nemoto committed with ralfbaechle Apr 4, 2008
    This is a board-independent TXx9 gpio API implementation using gpiolib.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  35. [MIPS] make fallback gpio.h gpiolib-friendly

    Atsushi Nemoto committed with ralfbaechle Apr 4, 2008
    If gpiolib was selected, asm-generic/gpio.h provides some prototypes
    for gpio API and implementation helpers.  With this patch, platform
    code can implement its GPIO API using gpiolib without custom gpio.h
    file.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>