Permalink
Switch branches/tags
Commits on May 1, 2008
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: fw-sbp2: log scsi_target ID at release
      ieee1394: fix NULL pointer dereference in sysfs access
    torvalds committed May 1, 2008
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus

    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
      kbuild: fix vmlinux.o link
      kconfig: made check-lxdialog more portable
    torvalds committed May 1, 2008
  3. Merge git://git.infradead.org/mtd-2.6

    * git://git.infradead.org/mtd-2.6:
      [MTD][NOR] Add physical address to point() method
      [JFFS2] Track parent inode for directories (for NFS export)
      [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
      [JFFS2] Quiet lockdep false positive.
      [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
      [MTD] Delete long-unused jedec.h header file.
      [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.
    torvalds committed May 1, 2008
  4. [MTD][NOR] Add physical address to point() method

    Adding the ability to get a physical address from point() in addition
    to virtual address.  This physical address is required for XIP of
    userspace code from flash.
    
    Signed-off-by: Jared Hulbert <jaredeh@gmail.com>
    Reviewed-by: Jörn Engel <joern@logfs.org>
    Acked-by: Nicolas Pitre <nico@cam.org>
    Acked-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    jaredeh committed with dwmw2 Apr 30, 2008
  5. firewire: fw-sbp2: log scsi_target ID at release

    Makes the good-by message more informative.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Jarod Wilson <jwilson@redhat.com>
    Stefan Richter committed Apr 24, 2008
  6. ieee1394: fix NULL pointer dereference in sysfs access

    Regression since "ieee1394: prevent device binding of raw1394,
    video1394, dv1394", commit d2ace29:
    $ cat /sys/bus/ieee1394/drivers/raw1394/device_ids
    triggers a NULL pointer dereference in fw_show_drv_device_ids.
    Reported by Miles Lane.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Tested-by: Miles Lane <miles.lane@gmail.com>
    Stefan Richter committed May 1, 2008
  7. [JFFS2] Track parent inode for directories (for NFS export)

    To support NFS export, we need to know the parent inode of directories.
    Rather than growing the jffs2_inode_cache structure, share space with
    the nlink field -- which was always set to 1 for directories anyway.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    dwmw2 committed May 1, 2008
  8. kbuild: fix vmlinux.o link

    We always linked vmliux.o.
    Remove init/built-in.o dependency so we avoid this
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Sam Ravnborg committed May 1, 2008
  9. kconfig: made check-lxdialog more portable

    OS-X shell did not like 'echo -e' so implement
    suggestion from Al Viro to use a more portable construct.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Al Viro <viro@ZenIV.linux.org.uk>
    Acked-By: Timur Tabi <timur@freescale.com>
    Sam Ravnborg committed May 1, 2008
  10. make generic sys_ptrace unconditional

    With s390 the last arch switched to the generic sys_ptrace yesterday so
    we can now kill the ifdef around it to enforce every new port it using
    it instead of introducing new weirdo versions.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Christoph Hellwig committed with torvalds May 1, 2008
  11. [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.

    We don't actually care about nlink; we only care whether the inode in
    question is unlinked or not.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    dwmw2 committed May 1, 2008
  12. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide: fix early setup of hwif->host_flags
    torvalds committed May 1, 2008
  13. Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

    * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
      hwmon: (adt7473) minor cleanup / refactoring
      hwmon: (asb100) Remove some dead code
      hwmon: (lm75) Fix an incorrect comment
      hwmon: (w83793) VID and VRM handling cleanups
      hwmon: (w83l785ts) Don't ask the user to report failures
      hwmon: (smsc47b397) add a new chip id (0x8c)
    torvalds committed May 1, 2008
  14. Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-f…

    …or-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      module: add MODULE_STATE_GOING notifier call
      module: Enhance verify_export_symbols
      module: set unused_gpl_crcs instead of overwriting unused_crcs
      module: neaten __find_symbol, rename to find_symbol
      module: reduce module image and resident size
      module: make module_sect_attrs private to kernel/module.c
    torvalds committed May 1, 2008
  15. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      [CRYPTO] cryptd: Correct kzalloc error test
      [CRYPTO] eseqiv: Fix off-by-one encryption
      [CRYPTO] api: Fix scatterwalk_sg_chain
      [CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
    torvalds committed May 1, 2008
  16. m68knommu: fix FEC driver locking

    It's easy: grab locks before talking to hardware and realease
    them afterwards. The one big lock has been splitted into a hw_lock
    and mii_lock.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  17. m68knommu: kill warnings in FEC driver

    linux-2.6-mk68/drivers/net/fec.c: In function 'fec_enet_module_init':
    linux-2.6-mk68/drivers/net/fec.c:2627: warning: unused variable 'j'
    linux-2.6-mk68/drivers/net/fec.c: At top level:
    linux-2.6-mk68/drivers/net/fec.c:2136: warning: 'mii_link_interrupt' defined but not used
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  18. m68knommu: remove unused interrupts in FEC driver

    Remove the acquisition of unused interrupt types. We don't need to
    register all the TX and RX varients used on some ColdFire FEC hardware.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  19. m68knommu: fix ColdFire 5272 fec driver hash registers

    Renamed the 5272 hash_table registers to match the "grp" hash_table
    registers of the other ColdFire parts. They are actually a group hash.
    The makes for consistent setup across all ColdFire parts.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  20. m68knommu: fix compare race in sched related code

    The interrupts must be disabled before considering the need resched
    bit of the task struct and they have to be disabled before calling
    schedule()
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  21. m68knommu: rework definition of HZ

    Rework the HZ definition to be more consistent with other architectures.
    Non-kernel includers will see a constant HZ setting of 100.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  22. m68knommu: update MAX_M68K_DMA_CHANNELS for some plattforms

    include/asm-m68knommu/mcfdma.h defines base0-3 for M523x,
    M527x and M528x so it looks this has been forgotten.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  23. m68knommu: remove unused CONFIG_DISKtel

    Remove unused CONFIG_DISKtel support.
    Missing config definition pointed out by
    Robert P. J. Day <rpjday@mindspring.com>
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  24. m68knommu: add WilFire and WildfireMod board support

    This patch adds linux-2.6.x kernel support for the Intec Automation
    ColdFire 5282-based boards, the WildFire and WildFireMod
    
    Signed-Off-By: Steve Bennett <steveb@workware.net.au>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    msteveb committed with torvalds May 1, 2008
  25. m68knommu: remove unused CONFIG_MTD_KeyTechnology

    Remove unused board type CONFIG_MTD_KeyTechnology.
    Pointed out by Robert P. J. Day <rpjday@mindspring.com>
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  26. m68knommu: fix 5206e UART init function naming

    Fix ColdFire 5206e platform UART init function naming.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Greg Ungerer committed with torvalds May 1, 2008
  27. m68knommu: add some missing sections into the linker script

    Add some missing sections into the linker script.
    Those are required for spinlocks & kallsyms.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  28. m68knommu: add pretty back strace

    With this patch and
     CONFIG_FRAME_POINTER=y
     CONFIG_KALLSYMS=y
    The backtrace shows resolved function names and their numeric
    address.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  29. m68knommu: add a missing backslash n in setup code

    add a missing backslash n in setup code
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  30. m68knommu: ColdFire add support for kernel preemption

    As the subject says this patch adds the support for kernel preemption
    on m68knommu Coldfire. I thing the same changes could be applied to
    68360 & 68328 but since I don't have the HW for testing, I don't touch it.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds May 1, 2008
  31. m68knommu: fix signal handling return path

    The return from software signal handling pushes code on the stack
    that system calls to the kernels cleanup code. This is borrowed
    directly from the m68k linux signal handler.
    
    The rt signal case is not quite right for the restricted instruction
    set of the ColdFire parts. And neither the normal signal case or rt
    signal case properly flushes/pushes the appropriate cache lines.
    
    Rework the return path to just call back through some code fragments
    in the kernel proper (with no MMU in the way we can do this). No
    cache problems, and less code overall.
    
    Original patch submitted by Wilson Callan <wcallan@savantav.com>
    
    Greg fixed the rt signal return path to use the proper system call
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Wilson Callan committed with torvalds May 1, 2008
  32. drivers/scsi/mvsas.c: fix printk warnings

    drivers/scsi/mvsas.c: In function `mvs_update_phyinfo':
    drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 5)
    drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 6)
    
    We do not know what type the arch uses to implement u64.
    
    Cc: Ke Wei <kewei@marvell.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andrew Morton committed with torvalds May 1, 2008
  33. drivers/scsi/ncr53c8xx.c: fix warning

    drivers/scsi/ncr53c8xx.c: In function 'process_waiting_list':
    drivers/scsi/ncr53c8xx.c:8225: warning: suggest parentheses around assignment used as truth value
    
    recently added by
    
    commit 172c122
    Author: Harvey Harrison <harvey.harrison@gmail.com>
    Date:   Mon Apr 28 16:50:03 2008 -0700
    
        scsi: fix integer as NULL pointer warnings
    
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andrew Morton committed with torvalds May 1, 2008
  34. drivers-char-synclinkc-inbreak-mgsl_put_char-fix

    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Cc: Paul Fulghum <paulkf@microgate.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andrew Morton committed with torvalds May 1, 2008
  35. drivers/char/synclink.c: unbreak mgsl_put_char()

    Repair the effects of
    
    commit 55da778
    Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Date:   Wed Apr 30 00:54:07 2008 -0700
    
        synclink series: switch to int put_char method
    
        Signed-off-by: Alan Cox <alan@redhat.com>
        Cc: Paul Fulghum <paulkf@microgate.com>
        Cc: Jiri Slaby <jirislaby@gmail.com>
    
    drivers/char/synclink_gt.c: In function 'put_char':
    drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
    
    and do some whitespace repair and unneeded-cast-removal in there as well.
    
    Cc: Paul Fulghum <paulkf@microgate.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andrew Morton committed with torvalds May 1, 2008