Permalink
Commits on Apr 23, 2008
  1. @NigelCunningham

    [TuxOnIce] Update revision to 3.0-rc7.

    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 23, 2008
  2. @NigelCunningham

    [TuxOnIce] Fix image/fs corruption from commit e89cd926640764fac66c30f2

    Yesterday's commit included a significant typo that (unfortunately
    wRAR found out the hard way) can cause filesystem corruption or at
    least image corruption. In the old code, there was a printk and the
    actual extent addtion. The printk had a typo. Guess which one I
    copied into the new code :(
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 23, 2008
Commits on Apr 22, 2008
  1. @NigelCunningham
  2. @NigelCunningham

    [TuxOnIce] Apply header reservation when size updated too (file).

    I made a mistake in thinking I could safely apply the
    header reservation in the routine that fills the list of
    blocks. If swap requirements don't increase, that routine
    is only called once. If header requirements increase,
    we can end up with a smaller header size still applied,
    resulting in the bio code catching the issue when
    writing the header. Re-apply the reservation if it changes,
    as well as in the first case.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  3. @NigelCunningham

    [TuxOnIce] Apply header reservation when size updated too.

    I made a mistake in thinking I could safely apply the
    header reservation in the routine that fills the list of
    blocks. If swap requirements don't increase, that routine
    is only called once. If header requirements increase,
    we can end up with a smaller header size still applied,
    resulting in the bio code catching the issue when
    writing the header. Re-apply the reservation if it changes,
    as well as in the first case.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  4. @NigelCunningham

    [TuxOnIce] Properly handle in file allocator errors in allocating ext…

    …ents.
    
    Properly handle and propogate extent allocation errors in the file allocator.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  5. @NigelCunningham

    [TuxOnIce] Adjust file allocator storage numbers for per-page overheads.

    Adjust the values the file allocator returns for storage allocated and
    available to account for per-page overheads (as we did in a previous
    page for the swap allocator).
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  6. @NigelCunningham

    [TuxOnIce] Make toi_add_to_extent_chain return -ENOMEM on allocation …

    …failure.
    
    Return the standard failure value, rather than 2 when failing to allocate
    an extent. This has been here waaaaay too long. (Pre 1.0?)
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  7. @NigelCunningham

    [TuxOnIce] Fix rounding issue in reporting module memory needs.

    Fix failure to round up the displayed number of pages needed for
    each module when showing module memory usage.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  8. @NigelCunningham

    [TuxOnIce] Use longs for swap header vars & return overhead adjusted …

    …results.
    
    Start using longs for our variables that record the number of header
    pages reserved and total swap pages allocated, and then ensure we
    return values adjusted for per-page overheads when telling core how
    much storage is available & allocated.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  9. @NigelCunningham

    [TuxOnIce] Recalculate storage available when updating image stats.

    When updating the image stats, update the amount of storage available as
    well.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  10. @NigelCunningham

    [TuxOnIce] Separate out adding swap extent to block chains.

    Separate out adding block ranges to the swap extent chains,
    for readability.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  11. @NigelCunningham

    [TuxOnIce] Improve header pages handling.

    Apply header space reservations after populating block lists;
    rename allocate_header_space to reserve_header_space.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  12. @NigelCunningham

    [TuxOnIce] Add comment indicating string signatures are old.

    String signatures "HaveImage" and "TuxOnIce" are now out of date.
    I'm leaving them in for backwards compatability, but put this
    comment in to make that clear.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  13. @NigelCunningham

    [TuxOnIce] Fix get_extra_pd1_allowance compile warning.

    Make orig_num_free a long instead of an int, to fix a compile
    warning.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  14. @NigelCunningham

    [TuxOnIce] Simplify swap allocation handling.

    Simplify the method of reserving space for the header and
    recording how much swap we've allocated: Only allocate
    storage from the allocate_storage routine (not from the
    allocate header space routine), and do the header space
    allocation when getting the block extents.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  15. @NigelCunningham

    [TuxOnIce] Make image prep variables longs.

    Switch image preparation variables from ints to longs as a beginning
    on support for larger memory and image sizes.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
    NigelCunningham committed Apr 22, 2008
  16. @torvalds

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

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/ipath: Correct capitalization "IntX" -> "INTx"
      IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
      IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
      IB/ipath: Build IBA7220 code unconditionally
      IB/ipath: Remove reference to dev->class_dev
      IB/ipath: Fix module parameter description for disable_sma
      RDMA/nes: Remove unneeded function declarations
    
    Fix up conflict in drivers/infiniband/hw/ipath/ipath_verbs.c (by picking
    the solution from the infiniband branch)
    torvalds committed Apr 22, 2008
  17. IB/ipath: Correct capitalization "IntX" -> "INTx"

    Match what the PCI specification uses.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  18. IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c

    The PCI MSI interface is stubbed out properly so that all the
    functions just return failure if PCI_MSI=n, so there's no reason to
    have "#ifdef CONFIG_PCI_MSI" blocks in ipath_iba7220.c.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  19. IB/ipath: Remove dependency on PCI_MSI || HT_IRQ

    Before IBA7220 support was added, the ipath driver didn't support any
    hardware unless PCI_MSI and/or HT_IRQ was enabled.  However, the
    IBA7220 can generate INTx interrupts, so it makes sense to allow the
    driver to be build even if PCI_MSI=n and HT_IRQ=n.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  20. IB/ipath: Build IBA7220 code unconditionally

    The new IBA7220 code added a call to ipath_init_iba7220_funcs() that
    is compiled unconditionally, but only built the IBA7220 code if
    PCI_MSI is enabled.  Fix this by building the IBA7220 file
    unconditonally.
    
    This fixes build breakage when PCI_MSI=n, HT_IRQ=y and
    INFINIBAND_IPATH=y reported by Ingo Molnar <mingo@elte.hu>:
    
     drivers/built-in.o: In function `ipath_init_one':
     ipath_driver.c:(.devinit.text+0x1e5bc): undefined reference to `ipath_init_iba7220_funcs'
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  21. IB/ipath: Remove reference to dev->class_dev

                                                                                                        
    Commit 124b4dc ("IB/ipath: add calls to new 7220 code and enable in                                
    build") inadvertently added core to set dev->class_dev.dev back into                                
    ib_ipath.  This is completely redundant since commit 1912ffb ("IB: Set                             
    class_dev->dev in core for nice device symlink"), which removed                                     
    class_dev setting from low-level drivers, and also will break the build
    when class_dev is removed completely from struct ib_device.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  22. @pebolle

    IB/ipath: Fix module parameter description for disable_sma

    Describe disable_sma parameter with its name rather than the internal
    ib_ipath_disable_sma variable name, so that the description shows up
    properly in modinfo.
    
    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Acked-by: Ralph Campbell <ralph.campbell@qlogic.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    pebolle committed with Roland Dreier Apr 22, 2008
  23. RDMA/nes: Remove unneeded function declarations

    Remove redundant static declarations of functions that are defined
    before they are used in the source.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    Roland Dreier committed Apr 22, 2008
  24. @torvalds

    infiniband: class_device fallout

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Stephen Rothwell committed with torvalds Apr 22, 2008
  25. @torvalds

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

    …/git/drzeus/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (26 commits)
      mmc: sdio_ops.c should #include "sdio_ops.h"
      mmc: proper prototypes for mmc_attach_*()
      mmc: make __mmc_release_bus() static
      sdhci: improve no card, no reset quirk
      MMC: OMAP: Do not busy wait for end of command for ever
      MMC: OMAP: Start new commands from work queue instead of irq
      MMC: OMAP: Lazy clock shutdown
      MMC: OMAP: Move failing command abortion to workqueue
      MMC: OMAP: Use tasklet instead of workqueue for cover switch notification
      MMC: OMAP: Check the get_cover_state function pointer if not set
      MMC: OMAP: Using setup_timer instead of init_timer
      MMC: OMAP: Abort stuck commands
      MMC: OMAP: General cleanup for MMC multislot support
      MMC: OMAP: Power functions modified to MMC multislot support
      MMC: OMAP: Fix timeout calculation for MMC multislot support
      MMC: OMAP: New release dma and abort xfer functions
      MMC: OMAP: Add back cover switch support
      MMC: OMAP: Introduce new multislot structure and change driver to use it
      MMC: OMAP: Remove cover switch handling to allow adding multislot support
      MMC: OMAP: Fix the BYTEBLOCK capability removal
      ...
    torvalds committed Apr 22, 2008
  26. @torvalds

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

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC]: Remove SunOS and Solaris binary support.
    torvalds committed Apr 22, 2008
Commits on Apr 21, 2008
  1. @torvalds

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

    …/git/juhl/trivial
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
      DOC:  A couple corrections and clarifications in USB doc.
      Generate a slightly more informative error msg for bad HZ
      fix typo "is" -> "if" in Makefile
      ext*: spelling fix prefered -> preferred
      DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
      KEYS:  Fix the comment to match the file name in rxrpc-type.h.
      RAID: remove trailing space from printk line
      DMA engine: typo fixes
      Remove unused MAX_NODES_SHIFT
      MAINTAINERS: Clarify access to OCFS2 development mailing list.
      V4L: Storage class should be before const qualifier (sn9c102)
      V4L: Storage class should be before const qualifier
      sonypi: Storage class should be before const qualifier
      intel_menlow: Storage class should be before const qualifier
      DVB: Storage class should be before const qualifier
      arm: Storage class should be before const qualifier
      ALSA: Storage class should be before const qualifier
      acpi: Storage class should be before const qualifier
      firmware_sample_driver.c: fix coding style
      MAINTAINERS: Add ati_remote2 driver
      ...
    
    Fixed up trivial conflicts in firmware_sample_driver.c
    torvalds committed Apr 21, 2008
  2. @torvalds

    Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block

    * 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
      block: fix blk_register_queue() return value
      block: fix memory hotplug and bouncing in block layer
      block: replace remaining __FUNCTION__ occurrences
      Kconfig: clean up block/Kconfig help descriptions
      cciss: fix warning oops on rmmod of driver
      cciss: Fix race between disk-adding code and interrupt handler
      block: move the padding adjustment to blk_rq_map_sg
      block: add bio_copy_user_iov support to blk_rq_map_user_iov
      block: convert bio_copy_user to bio_copy_user_iov
      loop: manage partitions in disk image
      cdrom: use kmalloced buffers instead of buffers on stack
      cdrom: make unregister_cdrom() return void
      cdrom: use list_head for cdrom_device_info list
      cdrom: protect cdrom_device_info list by mutex
      cdrom: cleanup hardcoded error-code
      cdrom: remove ifdef CONFIG_SYSCTL
    torvalds committed Apr 21, 2008
  3. @torvalds

    frv: unexport kmap_atomic_to_page

    This patch removes the no longer used export of kmap_atomic_to_page.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Adrian Bunk committed with torvalds Apr 21, 2008
  4. @torvalds

    frv: remove HARD_RESET_NOW()

    HARD_RESET_NOW() was unused.
    
    And one of the few remaining cli() users.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Adrian Bunk committed with torvalds Apr 21, 2008
  5. @torvalds

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

    …/git/jmorris/selinux-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
      SELinux: one little, two little, three little whitespaces, the avc.c saga.
      SELinux: cleanup on isle selinuxfs.c
      changing whitespace for fun and profit: policydb.c
      SELinux: whitespace and formating fixes for hooks.c
      SELinux: clean up printks
      SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
      SELinux: services.c whitespace, syntax, and static declaraction cleanups
      SELinux: mls.c whitespace, syntax, and static declaraction cleanups
      SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
      SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
      SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
      SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
      SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
      SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
      SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
      SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
      SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
      SELinux: netif.c whitespace, syntax, and static declaraction cleanups
    torvalds committed Apr 21, 2008
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (42 commits)
      PCI: Change PCI subsystem MAINTAINER
      PCI: pci-iommu-iotlb-flushing-speedup
      PCI: pci_setup_bridge() mustn't be __devinit
      PCI: pci_bus_size_cardbus() mustn't be __devinit
      PCI: pci_scan_device() mustn't be __devinit
      PCI: pci_alloc_child_bus() mustn't be __devinit
      PCI: replace remaining __FUNCTION__ occurrences
      PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
      PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
      PCI: clean up resource alignment management
      PCI: aerdrv_acpi.c: remove unneeded NULL check
      PCI: Update VIA CX700 quirk
      PCI: Expose PCI VPD through sysfs
      PCI: iommu: iotlb flushing
      PCI: simplify quirk debug output
      PCI: iova RB tree setup tweak
      PCI: parisc: use generic pci_enable_resources()
      PCI: ppc: use generic pci_enable_resources()
      PCI: powerpc: use generic pci_enable_resources()
      PCI: ia64: use generic pci_enable_resources()
      ...
    torvalds committed Apr 21, 2008
  7. @rpjday

    DOC: A couple corrections and clarifications in USB doc.

    A couple of corrections and clarifications in USB
    documentation.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
    rpjday committed with Jesper Juhl Apr 21, 2008