Eric Lee / smarc-fsl-linux-kernel

24 May, 2010

1 commit

  • f13771187   Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing ... Browse Code »

    * 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
    uml: Pushdown the bkl from harddog_kern ioctl
    sunrpc: Pushdown the bkl from sunrpc cache ioctl
    sunrpc: Pushdown the bkl from ioctl
    autofs4: Pushdown the bkl from ioctl
    uml: Convert to unlocked_ioctls to remove implicit BKL
    ncpfs: BKL ioctl pushdown
    coda: Clean-up whitespace problems in pioctl.c
    coda: BKL ioctl pushdown
    drivers: Push down BKL into various drivers
    isdn: Push down BKL into ioctl functions
    scsi: Push down BKL into ioctl functions
    dvb: Push down BKL into ioctl functions
    smbfs: Push down BKL into ioctl function
    coda/psdev: Remove BKL from ioctl function
    um/mmapper: Remove BKL usage
    sn_hwperf: Kill BKL usage
    hfsplus: Push down BKL into ioctl function

    Linus Torvalds
     

22 May, 2010

3 commits

  • cf9b59e9d   Merge remote branch 'origin' into secretlab/next-devicetree ... Browse Code »

    Merging in current state of Linus' tree to deal with merge conflicts and
    build failures in vio.c after merge.

    Conflicts:
    drivers/i2c/busses/i2c-cpm.c
    drivers/i2c/busses/i2c-mpc.c
    drivers/net/gianfar.c

    Also fixed up one line in arch/powerpc/kernel/vio.c to use the
    correct node pointer.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • 4018294b5   of: Remove duplicate fields from of_platform_driver ... Browse Code »

    .name, .match_table and .owner are duplicated in both of_platform_driver
    and device_driver. This patch is a removes the extra copies from struct
    of_platform_driver and converts all users to the device_driver members.

    This patch is a pretty mechanical change. The usage model doesn't change
    and if any drivers have been missed, or if anything has been fixed up
    incorrectly, then it will fail with a compile time error, and the fixup
    will be trivial. This patch looks big and scary because it touches so
    many files, but it should be pretty safe.

    Signed-off-by: Grant Likely
    Acked-by: Sean MacLennan

    Grant Likely
     
  • 2c3c8bea6   sysfs: add struct file* to bin_attr callbacks ... Browse Code »

    This allows bin_attr->read,write,mmap callbacks to check file specific data
    (such as inode owner) as part of any privilege validation.

    Signed-off-by: Chris Wright
    Signed-off-by: Greg Kroah-Hartman

    Chris Wright
     

21 May, 2010

1 commit

  • 542912635   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
    pcmcia: disable PCMCIA ioctl also for ARM
    drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
    drivers/staging/comedi: dev_node removal (ni_mio_cs)
    drivers/staging/comedi: dev_node removal (ni_labpc_cs)
    drivers/staging/comedi: dev_node removal (ni_daq_dio24)
    drivers/staging/comedi: dev_node removal (ni_daq_700)
    drivers/staging/comedi: dev_node removal (das08_cs)
    drivers/staging/comedi: dev_node removal (cb_das16_cs)
    pata_pcmcia: get rid of extra indirection
    pcmcia: remove suspend-related comment from yenta_socket.c
    pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
    pcmcia: remove pcmcia_add_device_lock
    pcmcia: update gfp/slab.h includes
    pcmcia: remove unused mem_op.h
    pcmcia: do not autoadd root PCI bus resources
    pcmcia: clarify alloc_io_space, move it to resource handlers
    pcmcia: move all pcmcia_resource_ops providers into one module
    pcmcia: move high level CIS access code to separate file
    pcmcia: dev_node removal (core)
    pcmcia: dev_node removal (remaining drivers)
    ...

    Linus Torvalds
     

19 May, 2010

1 commit

17 May, 2010

2 commits

11 May, 2010

1 commit

10 May, 2010

14 commits

08 May, 2010

1 commit

05 May, 2010

2 commits

03 May, 2010

1 commit

01 May, 2010

1 commit

  • 0000a5390   MIPS: DB1200: PCMCIA card detection must not be auto-enabled. ... Browse Code »

    Same issues as SD card detection: One of both is always triggering and the
    handlers take care to shut it up and enable the other. To avoid messages
    about "unbalanced interrupt enable/disable" they must not be automatically
    enabled when initally requested.

    This was not an issue with the db1200_defconfig due to fortunate timings;
    on a build without network chip support the warnings appear.

    Signed-off-by: Manuel Lauss
    To: Linux-MIPS
    Patchwork: http://patchwork.linux-mips.org/patch/1133/
    Signed-off-by: Ralf Baechle

    Manuel Lauss
     

27 Apr, 2010

1 commit

  • 83bf6f11e   pcmcia: fix matching rules for pseudo-multi-function cards ... Browse Code »

    Prevent PCMCIA_DEV_ID_MATCH_FUNC_ID from grabbing PFC-cards:
    I changed the code, so that the first matching struct
    pcmcia_device_id _PFC_ entry will mark the card has_pfc,
    preventing PCMCIA_DEV_ID_MATCH_FUNC_ID to match.

    [linux-pcmcia@lists.infradead.org: re-order commit message]
    Signed-off-by: Alexander Kurz
    Signed-off-by: Dominik Brodowski

    Alexander Kurz
     

21 Apr, 2010

1 commit

  • 04de08161   pcmcia: pcmcia_dev_present bugfix ... Browse Code »

    pcmcia_dev_present is in and by itself buggy. Add a note specifying
    why it is broken, and replace the broken locking -- taking a mutex
    is a bad idea in IRQ context, from which this function is rarely
    called -- by an atomic_t.

    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

17 Apr, 2010

2 commits

  • 42d284b98   drivers/pcmcia: Add missing local_irq_restore ... Browse Code »

    Use local_irq_restore in this error-handling case just like in the one just
    below.

    A simplified version of the semantic patch that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @r exists@
    expression E1;
    identifier f;
    @@

    f (...) { }
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Dominik Brodowski

    Julia Lawall
     
  • a8408c17d   pcmcia: avoid late calls to pccard_validate_cis ... Browse Code »

    pccard_validate_cis() nowadays destroys the CIS cache. Therefore,
    calling it after card setup should be avoided. We can't control
    the deprecated PCMCIA ioctl (which is only used on ARM nowadays),
    but we can avoid -- and report -- any other calls.

    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

16 Apr, 2010

1 commit

11 Apr, 2010

3 commits

07 Apr, 2010

1 commit

05 Apr, 2010

1 commit

  • 147a27460   pcmcia: fix up alignf issues ... Browse Code »

    - pcmcia_align() used a "start" variable twice. That's obviously a bad
    idea.

    - pcmcia_common_resource() needs the current "start" parameter being
    passed, instead of res->start.

    - pcmcia_common_resource() doesn't use the size and align parameters,
    so get rid of those.

    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

27 Mar, 2010

1 commit

  • b72c40949   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1
    x86/PCI: for host bridge address space collisions, show conflicting resource
    frv/PCI: remove redundant warnings
    x86/PCI: remove redundant warnings
    PCI: don't say we claimed a resource if we failed
    PCI quirk: Disable MSI on VIA K8T890 systems
    PCI quirk: RS780/RS880: work around missing MSI initialization
    PCI quirk: only apply CX700 PCI bus parking quirk if external VT6212L is present
    PCI: complain about devices that seem to be broken
    PCI: print resources consistently with %pR
    PCI: make disabled window printk style match the enabled ones
    PCI: break out primary/secondary/subordinate for readability
    PCI: for address space collisions, show conflicting resource
    resources: add interfaces that return conflict information
    PCI: cleanup error return for pcix get and set mmrbc functions
    PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions
    PCI: kill off pci_register_set_vga_state() symbol export.
    PCI: fix return value from pcix_get_max_mmrbc()

    Linus Torvalds