Skip to content
This repository
branch: master

Jun 16, 2010

  1. Tony Lindgren

    Linux-omap rebuilt: Updated to -rc3, omap-fixes-for-linus updated

    $ git checkout -b tmp-rebuild-1276704487 linus
    $ git merge -m "Merge cbus" cbus
    $ git merge -m "Merge omap-fixes" omap-fixes
    $ git merge -m "Merge omap-testing" omap-testing
    $ git merge -m "Merge i2c-omap-for-ben" i2c-omap-for-ben
    $ git merge -m "Merge for-next" for-next
    $ git merge -s ours master
    $ git checkout master
    $ git merge tmp-rebuild-1276704487
    
    To view the changes since the last rebuild, please do
    $ git diff ebced05..a391dda arch/arm/*omap*/
    tmlind authored
  2. Tony Lindgren

    Merge for-next

    tmlind authored
  3. Tony Lindgren

    Merge omap-testing

    tmlind authored
  4. Tony Lindgren

    Merge omap-fixes

    tmlind authored
  5. Tony Lindgren

    Merge cbus

    tmlind authored
  6. omap iommu: fix: Make omap-iommu.o built-in

    This also fixes the wrong overwritten for "obj-y" in the previous
    commit.
    
    Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Hiroshi DOYU authored tmlind committed
  7. omap iommu: fix ducati mmu irq define name

    Use the correct Ducati mmu irq definition.
    
    [Hiroshi: update description]
    
    Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
    Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
    Kanigeri, Hari authored tmlind committed
  8. Tony Lindgren

    omap: Add back UART MDR1 check into uncompress.h

    Recent DEBUG_LL and uncompress.h changes removed the check_port()
    as pointed out by Cory Maccarrone <darkstar6262@gmail.com>.
    
    This causes some boards to not boot, so add back the MDR1 register
    check. The MDR1 register tells the mode of omap uart. Based on
    an earlier patch by Cory Maccarrone <darkstar6262@gmail.com>.
    
    Tested-by: Cory Maccarrone <darkstar6262@gmail.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    tmlind authored
  9. omap: Overo: Fix support for second ethernet port

    The original patch got truncated when applied from patchwork.kernel.org
    as discussed at:
    
    http://www.mail-archive.com/linux-omap@vger.kernel.org/msg28953.html
    
    This patch supplies the missing chunks.
    
    Signed-off-by: Steve Sakoman <sakoman@gmail.com>
    [tony@atomide.com: added more info to the patch description]
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Steve Sakoman authored tmlind committed
  10. ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  11. ARM: Convert platform reservations to use LMB rather than bootmem

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  12. ARM: initial LMB trial

    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  13. ARM: OMAP: Convert to use ->reserve method to reserve boot time memory

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  14. ARM: OMAP: Cleanup OMAP FB SDRAM reservation

    The logic in this file is rather convoluted, but essentially:
    
    1. region type 0 is SDRAM
    2. referring to the code fragment
                    if (set_fbmem_region_type(&rg, OMAPFB_MEMTYPE_SDRAM,
                                              sdram_start, sdram_size) < 0 ||
                        (rg.type != OMAPFB_MEMTYPE_SDRAM))
                            continue;
       - if rg.type is not OMAPFB_MEMTYPE_SDRAM, set_fbmem_region_type()
         returns zero immediately (since rg.type is non-zero), and so we
         'continue'.
       - if rg.type is OMAPFB_MEMTYPE_SDRAM, and rg.paddr is zero,
         we fall through.
       - if rg.type is OMAPFB_MEMTYPE_SDRAM, and the region lies within
         SDRAM, we fall through.
       - if rg.type is OMAPFB_MEMTYPE_SDRAM, and the region is not within
         SDRAM, we 'continue'.
    3. check_fbmem_region seems unnecessary.
       - we know rg.type is OMAPFB_MEMTYPE_SDRAM
       - we can check rg.size independently
       - bootmem_reserve() can check for overlapping reservations itself
       - we've already validated that the requested region lies within SDRAM.
    4. avoid BUG()ing if the region entry is already set; print an error,
       and mark the configuration invalid - at least we'll continue booting
       so the error message has a chance of being logged/visible via serial
       console.
    
    With these changes in place, it makes the code much easier to understand
    and hence easier to convert to LMB.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  15. ARM: Move platform memory reservations out of generic code

    Move the platform specific bootmem memory reservations out of
    arch/arm/mm/mmu.c into their respective platform files.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  16. ARM: Remove 'node' argument form arch_adjust_zones()

    Since we no longer support discontigmem, node is always zero, so
    remove this argument.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  17. ARM: Remove DISCONTIGMEM support

    Everything should now be using sparsemem rather than discontigmem, so
    remove the code supporting discontigmem from ARM.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  18. ARM: Precalculate vmalloc_min

    Rather than storing the minimum size of the vmalloc area, store the
    maximum permitted address of the vmalloc area instead.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King authored tmlind committed
  19. usb: host: ehci: fix missing kfree in remove path also

    Added missing kfree() in ehci_hcd_omap_remove().
    
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Ajay Kumar Gupta authored tmlind committed
  20. Santosh

    OMAP4: clock: Fix multi-omap boot with reset un-used clocks

    This patch uses "ENABLE_ON_INIT" flag on the emif clock nodes
    to avoid the emif clk getting cut as part of reset un-used clock
    routine which prevents boot.
    
    Since "omap4xxx_clk_init()" calls "clk_enable_init_clocks()"
    which increases the usecount on all ENABLE_ON_INIT clocks, it
    prevents "omap2_clk_disable_unused()" from disabling the clock.
    
    The real fix is to have driver for EMIF and do clock get/enable
    as part of it. The EMIF driver is planned to be done HWMOD way
    so till that available to keep omap3_defconfig booting on OMAP4430,
    this patch is necessary.
    (Will updated the auto-gen script for 44xx accordingly)
    
    The fix was suggested by Paul Walmsley
    
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Tested-by: Nishanth Menon <nm@ti.com>
    Acked-by: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    SantoshShilimkar authored tmlind committed

Jun 12, 2010

  1. Linus Torvalds

    Linux 2.6.35-rc3

    torvalds authored

Jun 11, 2010

  1. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      wimax/i2400m: fix missing endian correction read in fw loader
      net8139: fix a race at the end of NAPI
      pktgen: Fix accuracy of inter-packet delay.
      pkt_sched: gen_estimator: add a new lock
      net: deliver skbs on inactive slaves to exact matches
      ipv6: fix ICMP6_MIB_OUTERRORS
      r8169: fix mdio_read and update mdio_write according to hw specs
      gianfar: Revive the driver for eTSEC devices (disable timestamping)
      caif: fix a couple range checks
      phylib: Add support for the LXT973 phy.
      net: Print num_rx_queues imbalance warning only when there are allocated queues
    torvalds authored
  2. Linus Torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / x86: Save/restore MISC_ENABLE register
    torvalds authored
  3. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: The file argument for fsync() is never null
      Btrfs: handle ERR_PTR from posix_acl_from_xattr()
      Btrfs: avoid BUG when dropping root and reference in same transaction
      Btrfs: prohibit a operation of changing acl's mask when noacl mount option used
      Btrfs: should add a permission check for setfacl
      Btrfs: btrfs_lookup_dir_item() can return ERR_PTR
      Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs
      Btrfs: unwind after btrfs_start_transaction() errors
      Btrfs: btrfs_iget() returns ERR_PTR
      Btrfs: handle kzalloc() failure in open_ctree()
      Btrfs: handle error returns from btrfs_lookup_dir_item()
      Btrfs: Fix BUG_ON for fs converted from extN
      Btrfs: Fix null dereference in relocation.c
      Btrfs: fix remap_file_pages error
      Btrfs: uninitialized data is check_path_shared()
      Btrfs: fix fallocate regression
      Btrfs: fix loop device on top of btrfs
    torvalds authored
  4. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: clear bridge resource range if BIOS assigned bad one
      PCI: hotplug/cpqphp, fix NULL dereference
      Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
      PCI: change resource collision messages from KERN_ERR to KERN_INFO
    torvalds authored
  5. PCI: clear bridge resource range if BIOS assigned bad one

    Yannick found that video does not work with 2.6.34.  The cause of this
    bug was that the BIOS had assigned the wrong range to the PCI bridge
    above the video device.  Before 2.6.34 the kernel would have shrunk
    the size of the bridge window, but since
      d65245c PCI: don't shrink bridge resources
    the kernel will avoid shrinking BIOS ranges.
    
    So zero out the old range if we fail to claim it at boot time; this will
    cause us to allocate a new range at startup, restoring the 2.6.34
    behavior.
    
    Fixes regression https://bugzilla.kernel.org/show_bug.cgi?id=16009.
    
    Reported-by: Yannick <yannick.roehlly@free.fr>
    Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Yinghai Lu authored Jesse Barnes committed
  6. PCI: hotplug/cpqphp, fix NULL dereference

    There are devices out there which are PCI Hot-plug controllers with
    compaq PCI IDs, but are not bridges, hence have pdev->subordinate
    NULL. But cpqphp expects the pointer to be non-NULL.
    
    Add a check to the probe function to avoid oopses like:
    BUG: unable to handle kernel NULL pointer dereference at 00000050
    IP: [<f82e3c41>] cpqhpc_probe+0x951/0x1120 [cpqphp]
    *pdpt = 0000000033779001 *pde = 0000000000000000
    ...
    
    The device here was:
    00:0b.0 PCI Hot-plug controller [0804]: Compaq Computer Corporation PCI Hotplug Controller [0e11:a0f7] (rev 11)
    	Subsystem: Compaq Computer Corporation Device [0e11:a2f8]
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Jiri Slaby authored Jesse Barnes committed
  7. Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"

    This reverts commit 75568f8.
    
    Since they're just a convenience anyway, remove these symlinks since
    they're causing duplicate filename errors in the wild.
    
    Acked-by: Alex Chiang <achiang@canonical.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Jesse Barnes authored
  8. PCI: change resource collision messages from KERN_ERR to KERN_INFO

    We can often deal with PCI resource issues by moving devices around.  In
    that case, there's no point in alarming the user with messages like these.
    There are many bug reports where the message itself is the only problem,
    e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/413419 .
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Bjorn Helgaas authored Jesse Barnes committed
  9. Btrfs: The file argument for fsync() is never null

    The "file" argument for fsync is never null so we can remove this check.
    
    What drew my attention here is that 7ea8085: "drop unused dentry
    argument to ->fsync" introduced an unconditional dereference at the
    start of the function and that generated a smatch warning.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Dan Carpenter authored chrismason-xx committed
  10. Btrfs: handle ERR_PTR from posix_acl_from_xattr()

    posix_acl_from_xattr() returns both ERR_PTRs and null, but it's OK to
    pass null values to set_cached_acl()
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Dan Carpenter authored chrismason-xx committed
  11. Sage Weil

    Btrfs: avoid BUG when dropping root and reference in same transaction

    If btrfs_ioctl_snap_destroy() deletes a snapshot but finishes
    with end_transaction(), the cleaner kthread may come in and
    drop the root in the same transaction.  If that's the case, the
    root's refs still == 1 in the tree when btrfs_del_root() deletes
    the item, because commit_fs_roots() hasn't updated it yet (that
    happens during the commit).
    
    This wasn't a problem before only because
    btrfs_ioctl_snap_destroy() would commit the transaction before dropping
    the dentry reference, so the dead root wouldn't get queued up until
    after the fs root item was updated in the btree.
    
    Since it is not an error to drop the root reference and the root in the
    same transaction, just drop the BUG_ON() in btrfs_del_root().
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    liewegas authored chrismason-xx committed
  12. shiwh

    Btrfs: prohibit a operation of changing acl's mask when noacl mount o…

    …ption used
    
    when used Posix File System Test Suite(pjd-fstest) to test btrfs,
    some cases about setfacl failed when noacl mount option used.
    I simplified used commands in pjd-fstest, and the following steps
    can reproduce it.
    ------------------------
    # cd btrfs-part/
    # mkdir aaa
    # setfacl -m m::rw aaa    <- successed, but not expected by pjd-fstest.
    ------------------------
    I checked ext3, a warning message occured, like as:
      setfacl: aaa/: Operation not supported
    Certainly, it's expected by pjd-fstest.
    
    So, i compared acl.c of btrfs and ext3. Based on that, a patch created.
    Fortunately, it works.
    
    Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    shiwh authored chrismason-xx committed
  13. shiwh

    Btrfs: should add a permission check for setfacl

    On btrfs, do the following
    ------------------
    # su user1
    # cd btrfs-part/
    # touch aaa
    # getfacl aaa
      # file: aaa
      # owner: user1
      # group: user1
      user::rw-
      group::rw-
      other::r--
    # su user2
    # cd btrfs-part/
    # setfacl -m u::rwx aaa
    # getfacl aaa
      # file: aaa
      # owner: user1
      # group: user1
      user::rwx           <- successed to setfacl
      group::rw-
      other::r--
    ------------------
    but we should prohibit it that user2 changing user1's acl.
    In fact, on ext3 and other fs, a message occurs:
      setfacl: aaa: Operation not permitted
    
    This patch fixed it.
    Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    shiwh authored chrismason-xx committed
  14. Btrfs: btrfs_lookup_dir_item() can return ERR_PTR

    btrfs_lookup_dir_item() can return either ERR_PTRs or null.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    Dan Carpenter authored chrismason-xx committed
Something went wrong with that request. Please try again.