30 Jul, 2010

1 commit


25 Jul, 2010

3 commits


24 Jul, 2010

13 commits

  • This list used was by only two platforms with all other platforms defining an
    own list of valid bus id's to pass to of_platform_bus_probe. This patch:

    i) copies the default list to the two platforms that depended on it (powerpc)
    ii) remove the usage of of_default_bus_ids in of_platform_bus_probe
    iii) removes the definition of the list from all architectures that defined it

    Passing a NULL 'matches' parameter to of_platform_bus_probe is still valid; the
    function returns no error in that case as the NULL value is equivalent to an
    empty list.

    Signed-off-by: Jonas Bonn
    [grant.likely@secretlab.ca: added __initdata annotations, warn on and return error on missing match table, and fix whitespace errors]
    Signed-off-by: Grant Likely

    Jonas Bonn
     
  • There's no need for this function to be architecture specific and all four
    architectures defining it had the same definition. The function has been
    moved to drivers/of/platform.c.

    Signed-off-by: Jonas Bonn
    [grant.likely@secretlab.ca: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment]
    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Jonas Bonn
     
  • of_device is just a #define alias to platform_device. This patch
    replaces all references to it with platform_device.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • of_device is just a #define alias to platform_device. This patch
    replaces all references to it with platform_device.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • of_device is just a #define alias to platform_device. This patch
    replaces all references to it with platform_device.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • of_device is currently just an #define alias to platform_device until it
    gets removed entirely. This patch removes references to it from the
    include directories and the core drivers/of code.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • There is an unlikely chance of this situation is occurring, but it is
    easy to protect against. If a matching entry cannot be found in the
    of_match_table, then don't bind the driver.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • It is mostly unused now. Sparc has a few defines left in it, but they
    can be moved to other headers. Removing this header means that new
    architectures adding CONFIG_OF support don't need to also add this
    header file.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • Only thing left in it is of_instantiate_rtc() which can be moved to
    asm/prom.h on PowerPC and is unused in microblaze.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • Both of_bus_type and of_platform_bus_type are just #define aliases
    for the platform bus. This patch removes all references to them and
    switches to the of_register_platform_driver()/of_unregister_platform_driver()
    API for registering.

    Subsequent patches will convert each user of of_register_platform_driver()
    into plain platform_drivers without the of_platform_driver shim. At which
    point the of_register_platform_driver()/of_unregister_platform_driver()
    functions can be removed.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • of_platform_bus was being used in the same manner as the platform_bus.
    The only difference being that of_platform_bus devices are generated
    from data in the device tree, and platform_bus devices are usually
    statically allocated in platform code. Having them separate causes
    the problem of device drivers having to be registered twice if it
    was possible for the same device to appear on either bus.

    This patch removes of_platform_bus_type and registers all of_platform
    bus devices and drivers on the platform bus instead. A previous patch
    made the of_device structure an alias for the platform_device structure,
    and a shim is used to adapt of_platform_drivers to the platform bus.

    After all of of_platform_bus drivers are converted to be normal platform
    drivers, the shim code can be removed.

    Signed-off-by: Grant Likely
    Acked-by: David S. Miller

    Grant Likely
     
  • As part of the merge between platform bus and of_platform bus, add the
    ability to do of-style matching to the platform bus.

    Signed-off-by: Grant Likely
    Acked-by: Greg Kroah-Hartman
    CC: Michal Simek
    CC: Grant Likely
    CC: Benjamin Herrenschmidt
    CC: Stephen Rothwell
    CC: linux-kernel@vger.kernel.org
    CC: microblaze-uclinux@itee.uq.edu.au
    CC: linuxppc-dev@ozlabs.org
    CC: devicetree-discuss@lists.ozlabs.org

    Grant Likely
     
  • Conflicts:
    arch/sparc/kernel/prom_64.c

    Grant Likely
     

23 Jul, 2010

7 commits

  • Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: synaptics - relax capability ID checks on newer hardware
    Input: twl40300-keypad - fix handling of "all ground" rows
    Input: gamecon - reference correct pad in gc_psx_command()
    Input: gamecon - reference correct input device in NES mode
    Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi'
    Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
    Input: qt2160 - rename kconfig symbol name

    Linus Torvalds
     
  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/radeon/kms: add quirk to make HP DV5000 laptop resume
    drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
    Fix ttm_page_alloc.c build breakage
    drm/radeon/kms: fix legacy LVDS dpms sequence
    drm/radeon/kms: drop taking lock around crtc lookup.

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: talitos - fix bug in sg_copy_end_to_buffer

    Linus Torvalds
     
  • …/frob/linux-2.6-roland

    * 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
    x86: auditsyscall: fix fastpath return value after reschedule

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function
    debug_core,kdb: fix kgdb_connected bit set in the wrong place
    Fix merge regression from external kdb to upstream kdb
    repair gdbstub to match the gdbserial protocol specification
    kdb: break out of kdb_ll() when command is terminated

    Linus Torvalds
     
  • Fix the security problem in the CIFS filesystem DNS lookup code in which a
    malicious redirect could be installed by a random user by simply adding a
    result record into one of their keyrings with add_key() and then invoking a
    CIFS CFS lookup [CVE-2010-2524].

    This is done by creating an internal keyring specifically for the caching of
    DNS lookups. To enforce the use of this keyring, the module init routine
    creates a set of override credentials with the keyring installed as the thread
    keyring and instructs request_key() to only install lookup result keys in that
    keyring.

    The override is then applied around the call to request_key().

    This has some additional benefits when a kernel service uses this module to
    request a key:

    (1) The result keys are owned by root, not the user that caused the lookup.

    (2) The result keys don't pop up in the user's keyrings.

    (3) The result keys don't come out of the quota of the user that caused the
    lookup.

    The keyring can be viewed as root by doing cat /proc/keys:

    2a0ca6c3 I----- 1 perm 1f030000 0 0 keyring .dns_resolver: 1/4

    It can then be listed with 'keyctl list' by root.

    # keyctl list 0x2a0ca6c3
    1 key in keyring:
    726766307: --alswrv 0 0 dns_resolver: foo.bar.com

    Signed-off-by: David Howells
    Reviewed-and-Tested-by: Jeff Layton
    Acked-by: Steve French
    Signed-off-by: Linus Torvalds

    David Howells
     

22 Jul, 2010

16 commits