17 Mar, 2006

10 commits


16 Mar, 2006

21 commits

  • Signed-off-by: Paul Mackerras

    Paul Mackerras
     
  • The dynamic add path for PCI Host Bridges can fail to configure children
    adapters under P5IOC controllers. It fails to properly fixup bus/device
    resources, and it fails to properly enable EEH. Both of these steps
    need to occur before any children devices are enabled in
    pci_bus_add_devices().

    Signed-off-by: John Rose
    Signed-off-by: Paul Mackerras

    John Rose
     
  • remove warnings when building a 64bit kernel.
    smp_call_function triggers also with 32bit kernel.

    WARNING: vmlinux: duplicate symbol 'smp_call_function' previous definition was in vmlinux
    arch/powerpc/kernel/ppc_ksyms.c:164:EXPORT_SYMBOL(smp_call_function);
    arch/powerpc/kernel/smp.c:300:EXPORT_SYMBOL(smp_call_function);

    WARNING: vmlinux: duplicate symbol 'ioremap' previous definition was in vmlinux
    arch/powerpc/kernel/ppc_ksyms.c:113:EXPORT_SYMBOL(ioremap);
    arch/powerpc/mm/pgtable_64.c:321:EXPORT_SYMBOL(ioremap);

    WARNING: vmlinux: duplicate symbol '__ioremap' previous definition was in vmlinux
    arch/powerpc/kernel/ppc_ksyms.c:117:EXPORT_SYMBOL(__ioremap);
    arch/powerpc/mm/pgtable_64.c:322:EXPORT_SYMBOL(__ioremap);

    WARNING: vmlinux: duplicate symbol 'iounmap' previous definition was in vmlinux
    arch/powerpc/kernel/ppc_ksyms.c:118:EXPORT_SYMBOL(iounmap);
    arch/powerpc/mm/pgtable_64.c:323:EXPORT_SYMBOL(iounmap);

    Signed-off-by: Olaf Hering
    Signed-off-by: Paul Mackerras

    Olaf Hering
     
  • We should be memset'ing the data we are pointing to, not the pointer
    itself. This is in an error path so we probably don't hit it much.

    Signed-off-by: Michael Neuling
    Signed-off-by: Paul Mackerras

    Michael Neuling
     
  • This patch fixes incorrect setting of powersave_nap to 1 on all
    PowerMacs, potentially causing memory corruption on some models. This
    bug was introuced by me during the 32/64 bits merge.

    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Paul Mackerras

    Benjamin Herrenschmidt
     
  • The wording of the CRASH_DUMP Kconfig option is not very clear. It gives you a
    kernel that can be used _as_ the kdump kernel, not a kernel that can boot into
    a kdump kernel.

    Signed-off-by: Michael Ellerman
    Signed-off-by: Paul Mackerras

    Michael Ellerman
     
  • Enable the onboard IDE driver for p610, p615 and p630.
    They have the CD connected to this card. All other RS/6000 systems with this
    controller have no connectors and dont need this option.

    Signed-off-by: Olaf Hering
    Signed-off-by: Paul Mackerras

    Olaf Hering
     
  • Correct the loop for cacheflush. No idea where I copied the code from,
    but the original does not work correct. Maybe the flush is not needed.

    Signed-off-by: Olaf Hering
    Signed-off-by: Paul Mackerras

    Olaf Hering
     
  • The recent changes to keep gettimeofday in sync with xtime had the side
    effect that it was occasionally possible for the time reported by
    gettimeofday to go back by a microsecond. There were two reasons:
    (1) when we recalculated the offsets used by gettimeofday every 2^31
    timebase ticks, we lost an accumulated fractional microsecond, and
    (2) because the update is done some time after the notional start of
    jiffy, if ntp is slowing the clock, it is possible to see time go backwards
    when the timebase factor gets reduced.

    This fixes it by (a) slowing the gettimeofday clock by about 1us in
    2^31 timebase ticks (a factor of less than 1 in 3.7 million), and (b)
    adjusting the timebase offsets in the rare case that the gettimeofday
    result could possibly go backwards (i.e. when ntp is slowing the clock
    and the timer interrupt is late). In this case the adjustment will
    reduce to zero eventually because of (a).

    Signed-off-by: Paul Mackerras

    Paul Mackerras
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285
    [ARM] 3365/1: [cleanup] header for compat.c exported functions
    [ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt
    [ARM] 3363/1: [cleanup] process.c - fix warnings
    [ARM] 3358/1: [S3C2410] add missing SPI DMA resources
    [ARM] 3357/1: enable frontlight on collie
    [ARM] Fix "thead" typo

    Linus Torvalds
     
  • This fixes not one, but _two_, silly (but admittedly hard to hit) bugs
    in the ext2 filesystem "readdir()" function. It also cleans up the code
    to avoid the unnecessary goto mess.

    The bugs were related to re-valiating the f_pos value after somebody had
    either done an "lseek()" on the directory to an invalid offset, or when
    the offset had become invalid due to a file being unlinked in the
    directory. The code would not only set the f_version too eagerly, it
    would also not update f_pos appropriately for when the offset fixup took
    place.

    When that happened, we'd occasionally subsequently fail the readdir()
    even when we shouldn't (no real harm done, but an ugly printk, and
    obviously you would end up not necessarily seeing all entries).

    Thanks to Masoud Sharbiani who noticed the problem
    and had a test-case for it, and also fixed up a thinko in the first
    version of this patch.

    Signed-off-by: Al Viro
    Acked-by: Masoud Sharbiani
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Patch from Ben Dooks

    arch/arm/kernel/setup.c declares mem_fclk_21285 when
    this is already declared in include/asm-arm/system.h

    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

    Ben Dooks
     
  • Patch from Ben Dooks

    arch/arm/kernel/compat.c exports two functions,
    convert_to_tag_list and squash_mem_tags which
    are not defined in any header files, and not
    used outside arch/arm/kernel.

    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

    Ben Dooks
     
  • Patch from Ben Dooks

    The enable_hlt and disable_hlt should be declared in
    include/asm/setup.h. This fixes sparse errors from
    arch/arm/kernel/process.c

    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

    Ben Dooks
     
  • Patch from Ben Dooks

    Fix the following warnings from sparse:

    arch/arm/kernel/process.c:86:6: warning: symbol 'default_idle' was not declared. Should it be static?
    arch/arm/kernel/process.c:378:5: warning: symbol 'dump_fpu' was not declared. Should it be static?

    Include for dump_fpu() decleration, and
    make default_idle() static as it is not used outside the file.

    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

    Ben Dooks
     
  • Fix QoS is not active even the network and the card is QOS enabled.
    The problem is we pass the wrong ieee80211_network address to
    ipw_handle_beacon/ipw_handle_probe_response, thus the
    ieee80211_network->qos_data.active will not be set, causing the driver
    not sending QoS frames at all.

    Signed-off-by: Hong Liu
    Signed-off-by: Zhu Yi
    Signed-off-by: John W. Linville

    Hong Liu
     
  • Use the correct STYPE for Qos data.

    Signed-off-by: Zhu Yi
    Signed-off-by: John W. Linville

    Zhu Yi
     
  • Olaf Hering reported a problem on pseries with e100 where ethtool -t would
    cause a bus error, and the e100 driver would stop working. Due to the new
    load ucode command the cb list must be allocated before calling
    e100_init_hw, so remove the call and just let e100_up take care of it.

    Signed-off-by: Jesse Brandeburg

    Jesse Brandeburg
     
  • The Coverity checker spotted the following bug in dup_namespace():

    if (!new_ns->root) {
    up_write(&namespace_sem);
    kfree(new_ns);
    goto out;
    }
    ...
    out:
    return new_ns;

    Callers expect a non-NULL result to not be freed.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     
  • Patch from Albrecht Dreß

    Add DMA resources to s3c2410 spi platform devices - dma_(alloc|free)_coherent should now work as expected.

    Signed-off-by: Albrecht Dreß
    Signed-off-by: Ben Dooks
    Signed-off-by: Russell King

    Albrecht Dreß
     
  • Patch from Pavel Machek

    Enable frontlight during collie bootup, so that display is actually
    readable in anything other than bright sunlight.

    Signed-off-by: Pavel Machek
    Signed-off-by: Richard Purdie
    Signed-off-by: Russell King

    Pavel Machek
     

15 Mar, 2006

9 commits

  • Signed-off-by: Russell King

    Russell King
     
  • It seems that setting scheduling policy and priorities is also the kind of
    thing that might be performed in apps that also use the NUMA API, so it
    would seem consistent to use CAP_SYS_NICE for NUMA also.

    So use CAP_SYS_NICE for controlling migration permissions.

    Signed-off-by: Christoph Lameter
    Cc: Michael Kerrisk
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • Update the documentation for page migration.

    - Fix up bits and pieces in cpusets.txt

    - Rework text in vm/page-migration to be clearer and reflect the final
    version of page migration in 2.6.16. Mention Andi Kleen's numactl
    package that contains user space tools for page migration via
    libnuma. Add reference to numa_maps and to the manpage in numactl.

    - Add todo list for outstanding issues

    Signed-off-by: Christoph Lameter
    Acked-by: Paul Jackson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • page migration currently simply retries a couple of times if try_to_unmap()
    fails without inspecting the return code.

    However, SWAP_FAIL indicates that the page is in a vma that has the
    VM_LOCKED flag set (if ignore_refs ==1). We can check for that return code
    and avoid retrying the migration.

    migrate_page_remove_references() now needs to return a reason why the
    failure occured. So switch migrate_page_remove_references to use -Exx
    style error messages.

    Signed-off-by: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Lameter
     
  • It seems this patch got dropped (it was in addition to the `s390:
    improve response code handling in chsc_enable_facility()' patch).

    Acked-by: Cornelia Huck
    Cc: Martin Schwidefsky
    Cc: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Greg Smith
     
  • * git://oss.sgi.com:8090/oss/git/rc-fixes:
    Fix a direct I/O locking issue revealed by the new mutex code.

    Linus Torvalds
     
  • Affects only XFS (i.e. DIO_OWN_LOCKING case) - currently it is
    not possible to get i_mutex locking correct when using DIO_OWN
    direct I/O locking in a filesystem due to indeterminism in the
    possible return code/lock/unlock combinations. This can cause
    a direct read to attempt a double i_mutex unlock inside XFS.

    We're now ensuring __blockdev_direct_IO always exits with the
    inode i_mutex (still) held for a direct reader.

    Tested with the three different locking modes (via direct block
    device access, ext3 and XFS) - both reading and writing; cannot
    find any regressions resulting from this change, and it clearly
    fixes the mutex_unlock warning originally reported here:
    http://marc.theaimsgroup.com/?l=linux-kernel&m=114189068126253&w=2

    Signed-off-by: Nathan Scott
    Acked-by: Christoph Hellwig

    Nathan Scott
     
  • This fixes a race where lsn could be cleared before taking the lock

    Signed-off-by: Dave Kleikamp
    Signed-off-by: Linus Torvalds

    Dave Kleikamp
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
    [SCSI] zfcp: fix device registration issues
    [SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS
    [SCSI] scsi: aha152x pcmcia driver needs spi transport
    [SCSI] zfcp: correctly set this_id for hosts
    [SCSI] Add Brownie to blacklist

    Linus Torvalds