Doug / smarc-fsl-linux-kernel

26 May, 2010

1 commit

  • ec96e2fe9   Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
    ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
    ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
    ARM: 6140/1: silence a bogus sparse warning in unwind.c
    ARM: mach-at91: duplicated include
    ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
    ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
    ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
    ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
    ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
    ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
    ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
    ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
    ARM: SPEAR6xx: remove duplicated #include
    ARM: s3c6400_defconfig: Add NAND driver
    ARM: s3c6400_defconfig: enable sound as modules
    ARM: s3c6400_defconfig: enable power management
    ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
    ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
    ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
    ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
    ...

    Linus Torvalds
     

22 May, 2010

2 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
     

21 May, 2010

1 commit

19 May, 2010

2 commits

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
     

08 Mar, 2010

1 commit

02 Mar, 2010

1 commit

27 Feb, 2010

1 commit

  • 37d400848   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
    crypto: aes_generic - Fix checkpatch errors
    crypto: fcrypt - Fix checkpatch errors
    crypto: ecb - Fix checkpatch errors
    crypto: des_generic - Fix checkpatch errors
    crypto: deflate - Fix checkpatch errors
    crypto: crypto_null - Fix checkpatch errors
    crypto: cipher - Fix checkpatch errors
    crypto: crc32 - Fix checkpatch errors
    crypto: compress - Fix checkpatch errors
    crypto: cast6 - Fix checkpatch errors
    crypto: cast5 - Fix checkpatch errors
    crypto: camellia - Fix checkpatch errors
    crypto: authenc - Fix checkpatch errors
    crypto: api - Fix checkpatch errors
    crypto: anubis - Fix checkpatch errors
    crypto: algapi - Fix checkpatch errors
    crypto: blowfish - Fix checkpatch errors
    crypto: aead - Fix checkpatch errors
    crypto: ablkcipher - Fix checkpatch errors
    crypto: pcrypt - call the complete function on error
    ...

    Linus Torvalds
     

16 Feb, 2010

1 commit

09 Feb, 2010

1 commit

  • 3ad2f3fbb   tree-wide: Assorted spelling fixes ... Browse Code »

    In particular, several occurances of funny versions of 'success',
    'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address',
    'beginning', 'desirable', 'separate' and 'necessary' are fixed.

    Signed-off-by: Daniel Mack
    Cc: Joe Perches
    Cc: Junio C Hamano
    Signed-off-by: Jiri Kosina

    Daniel Mack
     

17 Jan, 2010

1 commit

  • d817cd525   virtio: fix section mismatch warnings ... Browse Code »

    Fix fixes the following warnings by renaming the driver structures to be
    suffixed with _driver.

    WARNING: drivers/virtio/virtio_balloon.o(.data+0x88): Section mismatch in reference from the variable virtio_balloon to the function .devexit.text:virtballoon_remove()

    WARNING: drivers/char/hw_random/virtio-rng.o(.data+0x88): Section mismatch in reference from the variable virtio_rng to the function .devexit.text:virtrng_remove()

    Signed-off-by: Jeff Mahoney
    Acked-by: Rusty Russell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Mahoney
     

23 Dec, 2009

1 commit

19 Dec, 2009

1 commit

  • bc85b25e5   hwrng: nomadik - Add hardware RNG driver ... Browse Code »

    The hardware random number generator by ST is used in both the Nomadik
    8815 SoC and the U8500. It returns 16 bits every 400ns with automatic
    delay if a read is issued too early. It depends on PLAT_NOMADIK.

    Signed-off-by: Alessandro Rubini
    Acked-by: Andrea Gallo
    Acked-by: Matt Mackall
    Signed-off-by: Herbert Xu

    Alessandro Rubini
     

10 Dec, 2009

1 commit

  • 18821b040   Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kerne… ... Browse Code »

    …l/git/tip/linux-2.6-tip

    * 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    agp: Remove the BKL from agp_open
    inifiband: Remove BKL from ipath_open()
    mips: Remove BKL from tb0219
    drivers: Remove BKL from scx200_gpio
    drivers: Remove BKL from pc8736x_gpio
    parisc: Remove BKL from eisa_eeprom
    rtc: Remove BKL from efirtc
    input: Remove BKL from hp_sdc_rtc
    hw_random: Remove BKL from core
    macintosh: Remove BKL from ans-lcd
    nvram: Drop the bkl from non-generic nvram_llseek()
    nvram: Drop the bkl from nvram_llseek()
    mem_class: Drop the bkl from memory_open()
    spi: Remove BKL from spidev_open
    drivers: Remove BKL from cs5535_gpio
    drivers: Remove BKL from misc_open

    Linus Torvalds
     

03 Dec, 2009

1 commit

01 Dec, 2009

3 commits

22 Oct, 2009

2 commits

  • ff07eb897   move virtrng_remove to .devexit.text ... Browse Code »

    The function virtrng_remove is used only wrapped by __devexit_p so define
    it using __devexit.

    Signed-off-by: Uwe Kleine-König
    Acked-by: Sam Ravnborg
    Cc: Rusty Russell
    Cc: Michael S. Tsirkin
    Acked-by: Christian Borntraeger
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Rusty Russell

    Uwe Kleine-König
     
  • e95646c3e   virtio: let header files include virtio_ids.h ... Browse Code »

    Rusty,

    commit 3ca4f5ca73057a617f9444a91022d7127041970a
    virtio: add virtio IDs file
    moved all device IDs into a single file. While the change itself is
    a very good one, it can break userspace applications. For example
    if a userspace tool wanted to get the ID of virtio_net it used to
    include virtio_net.h. This does no longer work, since virtio_net.h
    does not include virtio_ids.h.
    This patch moves all "#include " from the C
    files into the header files, making the header files compatible with
    the old ones.

    In addition, this patch exports virtio_ids.h to userspace.

    CC: Fernando Luis Vazquez Cao
    Signed-off-by: Christian Borntraeger
    Signed-off-by: Rusty Russell

    Christian Borntraeger
     

14 Oct, 2009

1 commit

25 Sep, 2009

1 commit

23 Sep, 2009

2 commits

20 Sep, 2009

1 commit

  • e454cea20   Driver-Core: extend devnode callbacks to provide permissions ... Browse Code »

    This allows subsytems to provide devtmpfs with non-default permissions
    for the device node. Instead of the default mode of 0600, null, zero,
    random, urandom, full, tty, ptmx now have a mode of 0666, which allows
    non-privileged processes to access standard device nodes in case no
    other userspace process applies the expected permissions.

    This also fixes a wrong assignment in pktcdvd and a checkpatch.pl complain.

    Signed-off-by: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     

18 Sep, 2009

1 commit

12 Sep, 2009

1 commit

  • 332a33921   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (102 commits)
    crypto: sha-s390 - Fix warnings in import function
    crypto: vmac - New hash algorithm for intel_txt support
    crypto: api - Do not displace newly registered algorithms
    crypto: ansi_cprng - Fix module initialization
    crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx
    crypto: fips - Depend on ansi_cprng
    crypto: blkcipher - Do not use eseqiv on stream ciphers
    crypto: ctr - Use chainiv on raw counter mode
    Revert crypto: fips - Select CPRNG
    crypto: rng - Fix typo
    crypto: talitos - add support for 36 bit addressing
    crypto: talitos - align locks on cache lines
    crypto: talitos - simplify hmac data size calculation
    crypto: mv_cesa - Add support for Orion5X crypto engine
    crypto: cryptd - Add support to access underlaying shash
    crypto: gcm - Use GHASH digest algorithm
    crypto: ghash - Add GHASH digest algorithm for GCM
    crypto: authenc - Convert to ahash
    crypto: api - Fix aligned ctx helper
    crypto: hmac - Prehash ipad/opad
    ...

    Linus Torvalds
     

09 Jul, 2009

1 commit

  • ad361c988   Remove multiple KERN_ prefixes from printk formats ... Browse Code »

    Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
    handling of log-levels and newlines") changed printk semantics. printk
    lines with multiple KERN_ prefixes are no longer emitted as
    before the patch.

    is now included in the output on each additional use.

    Remove all uses of multiple KERN_s in formats.

    Signed-off-by: Joe Perches
    Signed-off-by: Linus Torvalds

    Joe Perches
     

25 Jun, 2009

1 commit

17 Jun, 2009

1 commit

16 Jun, 2009

1 commit

15 Jun, 2009

1 commit

  • 2cf4d4514   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
    MAINTAINERS: EB110ATX is not ebsa110
    MAINTAINERS: update Eric Miao's email address and status
    fb: add support of LCD display controller on pxa168/910 (base layer)
    [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
    [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
    [ARM] 5544/1: Trust PrimeCell resource sizes
    [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
    [ARM] pxa/sharpsl_pm: drop set_irq_type calls
    [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
    [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
    [ARM] sa1100: remove unused collie_pm.c
    [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
    [ARM] 5550/1: Add default configure file for w90p910 platform
    [ARM] 5549/1: Add clock api for w90p910 platform.
    [ARM] 5548/1: Add gpio api for w90p910 platform
    [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
    [ARM] Make ARM_VIC_NR depend on ARM_VIC
    [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
    ARM: OMAP4: SMP: Update defconfig for OMAP4430
    ARM: OMAP4: SMP: Enable SMP support for OMAP4430
    ...

    Linus Torvalds
     

14 Jun, 2009

1 commit

  • 32f44d62e   Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (35 commits)
    hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)
    crypto: api - Use formatting of module name
    crypto: testmgr - Allow hash test vectors longer than a page
    crypto: testmgr - Check all test vector lengths
    crypto: hifn_795x - fix __dev{init,exit} markings
    crypto: tcrypt - Do not exit on success in fips mode
    crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}
    hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 builds
    hwrng: via_rng - Support VIA Nano hardware RNG
    hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not Chipset
    crypto: testmgr - Skip algs not flagged fips_allowed in fips mode
    crypto: testmgr - Mark algs allowed in fips mode
    crypto: testmgr - Add ctr(aes) test vectors
    crypto: testmgr - Dynamically allocate xbuf and axbuf
    crypto: testmgr - Print self-test pass notices in fips mode
    crypto: testmgr - Catch base cipher self-test failures in fips mode
    crypto: testmgr - Add ansi_cprng test vectors
    crypto: testmgr - Add infrastructure for ansi_cprng self-tests
    crypto: testmgr - Add self-tests for rfc4309(ccm(aes))
    crypto: testmgr - Handle AEAD test vectors expected to fail verification
    ...

    Linus Torvalds
     

12 Jun, 2009

3 commits

03 Jun, 2009

1 commit

02 Jun, 2009

1 commit