18 Dec, 2009

5 commits


17 Dec, 2009

35 commits

  • Takashi Iwai
     
  • limit and jiffies are unsigned so the test did not work.

    Signed-off-by: Roel Kluin
    Signed-off-by: Takashi Iwai

    Roel Kluin
     
  • Signed-off-by: Jaroslav Kysela
    Signed-off-by: Takashi Iwai

    Jaroslav Kysela
     
  • Replacing
    error = 0;
    if (error)
    op
    with nothing is not quite an equivalent transformation ;-)

    Signed-off-by: Al Viro

    Al Viro
     
  • * 'for-linus' of git://oss.sgi.com/xfs/xfs:
    XFS: Free buffer pages array unconditionally
    xfs: kill xfs_bmbt_rec_32/64 types
    xfs: improve metadata I/O merging in the elevator
    xfs: check for not fully initialized inodes in xfs_ireclaim

    Linus Torvalds
     
  • Commit 3d1e4631 ("get rid of init_file()") removed the export of
    alloc_file() -- possibly inadvertently, since that commit mainly
    consisted of deleting the lines between the end of alloc_file() and
    the start of the code in init_file().

    There is in fact one modular use of alloc_file() in the tree, in
    drivers/infiniband/core/uverbs_main.c, so re-add the export to fix:

    ERROR: "alloc_file" [drivers/infiniband/core/ib_uverbs.ko] undefined!

    when CONFIG_INFINIBAND_USER_ACCESS=m.

    Cc: Al Viro
    Signed-off-by: Roland Dreier
    Signed-off-by: Linus Torvalds

    Roland Dreier
     
  • * 'next' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
    powerpc: fix up for mmu_mapin_ram api change
    powerpc: wii: allow ioremap within the memory hole
    powerpc: allow ioremap within reserved memory regions
    wii: use both mem1 and mem2 as ram
    wii: bootwrapper: add fixup to calc useable mem2
    powerpc: gamecube/wii: early debugging using usbgecko
    powerpc: reserve fixmap entries for early debug
    powerpc: wii: default config
    powerpc: wii: platform support
    powerpc: wii: hollywood interrupt controller support
    powerpc: broadway processor support
    powerpc: wii: bootwrapper bits
    powerpc: wii: device tree
    powerpc: gamecube: default config
    powerpc: gamecube: platform support
    powerpc: gamecube/wii: flipper interrupt controller support
    powerpc: gamecube/wii: udbg support for usbgecko
    powerpc: gamecube/wii: do not include PCI support
    powerpc: gamecube/wii: declare as non-coherent platforms
    powerpc: gamecube/wii: introduce GAMECUBE_COMMON
    ...

    Fix up conflicts in arch/powerpc/mm/fsl_booke_mmu.c.

    Hopefully even close to correctly.

    Linus Torvalds
     
  • * 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/vmwgfx: Add DRM driver for VMware Virtual GPU
    drm/vmwgfx: Add svga headers for vmwgfx driver
    drm/ttm: Add more driver type enums

    Linus Torvalds
     
  • * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (34 commits)
    HWPOISON: Remove stray phrase in a comment
    HWPOISON: Try to allocate migration page on the same node
    HWPOISON: Don't do early filtering if filter is disabled
    HWPOISON: Add a madvise() injector for soft page offlining
    HWPOISON: Add soft page offline support
    HWPOISON: Undefine short-hand macros after use to avoid namespace conflict
    HWPOISON: Use new shake_page in memory_failure
    HWPOISON: Use correct name for MADV_HWPOISON in documentation
    HWPOISON: mention HWPoison in Kconfig entry
    HWPOISON: Use get_user_page_fast in hwpoison madvise
    HWPOISON: add an interface to switch off/on all the page filters
    HWPOISON: add memory cgroup filter
    memcg: add accessor to mem_cgroup.css
    memcg: rename and export try_get_mem_cgroup_from_page()
    HWPOISON: add page flags filter
    mm: export stable page flags
    HWPOISON: limit hwpoison injector to known page types
    HWPOISON: add fs/device filters
    HWPOISON: return 0 to indicate success reliably
    HWPOISON: make semantics of IGNORED/DELAYED clear
    ...

    Linus Torvalds
     
  • As predicted during code review, the sysctl(2) changes made systems with
    old glibc nearly unusable. About every command gives a:

    warning: process `ls' used the deprecated sysctl system call with 1.4

    warning in the log.

    I see this on a SUSE 10.0 system with glibc 2.3.5.

    Don't warn for this common case.

    Signed-off-by: Andi Kleen
    Signed-off-by: Linus Torvalds

    Andi Kleen
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (117 commits)
    ACPI processor: Fix section mismatch for processor_add()
    ACPI: Add platform-wide _OSC support.
    ACPI: cleanup pci_root _OSC code.
    ACPI: Add a generic API for _OSC -v2
    msi-wmi: depend on backlight and fix corner-cases problems
    msi-wmi: switch to using input sparse keymap library
    msi-wmi: replace one-condition switch-case with if statement
    msi-wmi: remove unused field 'instance' in key_entry structure
    msi-wmi: remove custom runtime debug implementation
    msi-wmi: rework init
    msi-wmi: remove useless includes
    X86 drivers: Introduce msi-wmi driver
    Toshiba Bluetooth Enabling driver (RFKill handler v3)
    ACPI: fix for lapic_timer_propagate_broadcast()
    acpi_pad: squish warning
    ACPI: dock: minor whitespace and style cleanups
    ACPI: dock: add struct dock_station * directly to platform device data
    ACPI: dock: dock_add - hoist up platform_device_register_simple()
    ACPI: dock: remove global 'dock_device_name'
    ACPI: dock: combine add|alloc_dock_dependent_device (v2)
    ...

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (52 commits)
    perf record: Use per-task-per-cpu events for inherited events
    perf record: Properly synchronize child creation
    perf events: Allow per-task-per-cpu counters
    perf diff: Percent calcs should use double values
    perf diff: Change the default sort order to "dso,symbol"
    perf diff: Use perf_session__fprintf_hists just like 'perf record'
    perf report: Fix cut'n'paste error recently introduced
    perf session: Move perf report specific hits out of perf_session__fprintf_hists
    perf tools: Move hist entries printing routines from perf report
    perf report: Generalize perf_session__fprintf_hists()
    perf symbols: Move symbol filtering to event__preprocess_sample()
    perf symbols: Adopt the strlists for dso, comm
    perf symbols: Make symbol_conf global
    perf probe: Fix to show which probe point is not found
    perf probe: Check symbols in symtab/kallsyms
    perf probe: Check build-id of vmlinux
    perf probe: Reject second attempt of adding same-name event
    perf probe: Support event name for --add option
    perf probe: Add glob matching support on --del
    perf probe: Use strlist__for_each macros in probe-event.c
    ...

    Linus Torvalds
     
  • * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
    direct I/O fallback sync simplification
    ocfs: stop using do_sync_mapping_range
    cleanup blockdev_direct_IO locking
    make generic_acl slightly more generic
    sanitize xattr handler prototypes
    libfs: move EXPORT_SYMBOL for d_alloc_name
    vfs: force reval of target when following LAST_BIND symlinks (try #7)
    ima: limit imbalance msg
    Untangling ima mess, part 3: kill dead code in ima
    Untangling ima mess, part 2: deal with counters
    Untangling ima mess, part 1: alloc_file()
    O_TRUNC open shouldn't fail after file truncation
    ima: call ima_inode_free ima_inode_free
    IMA: clean up the IMA counts updating code
    ima: only insert at inode creation time
    ima: valid return code from ima_inode_alloc
    fs: move get_empty_filp() deffinition to internal.h
    Sanitize exec_permission_lite()
    Kill cached_lookup() and real_lookup()
    Kill path_lookup_open()
    ...

    Trivial conflicts in fs/direct-io.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM: rwsem.h need not be included into main.c
    PM: Remove unnecessary goto from device_resume_noirq()
    PM: Add initcall_debug style timing for suspend/resume
    PM: allow for usage_count > 0 in pm_runtime_get()

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix kprobes build with non-gawk awk
    x86: Split swiotlb initialization into two stages
    x86: Regex support and known-movable symbols for relocs, fix _end
    x86, msr: Remove incorrect, duplicated code in the MSR driver
    x86: Merge kernel_thread()
    x86: Sync 32/64-bit kernel_thread
    x86, 32-bit: Use same regs as 64-bit for kernel_thread_helper
    x86, 64-bit: Use user_mode() to determine new stack pointer in copy_thread()
    x86, 64-bit: Move kernel_thread to C
    x86-64, paravirt: Call set_iopl_mask() on 64 bits
    x86-32: Avoid pipeline serialization in PTREGSCALL1 and 2
    x86: Merge sys_clone
    x86, 32-bit: Convert sys_vm86 & sys_vm86old
    x86: Merge sys_sigaltstack
    x86: Merge sys_execve
    x86: Merge sys_iopl
    x86-32: Add new pt_regs stubs
    cpumask: Use modern cpumask style in arch/x86/kernel/cpu/mcheck/mce-inject.c

    Linus Torvalds
     
  • …nel/git/tip/linux-2.6-tip

    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    tracing: Fix return of trace_dump_stack()
    ksym_tracer: Fix bad cast
    tracing/power: Remove two exports
    tracing: Change event->profile_count to be int type
    tracing: Simplify trace_option_write()
    tracing: Remove useless trace option
    tracing: Use seq file for trace_clock
    tracing: Use seq file for trace_options
    function-graph: Allow writing the same val to set_graph_function
    ftrace: Call trace_parser_clear() properly
    ftrace: Return EINVAL when writing invalid val to set_ftrace_filter
    tracing: Move a printk out of ftrace_raw_reg_event_foo()
    tracing: Pull up calls to trace_define_common_fields()
    tracing: Extract duplicate ftrace_raw_init_event_foo()
    ftrace.h: Use common pr_info fmt string
    tracing: Add stack trace to irqsoff tracer
    tracing: Add trace_dump_stack()
    ring-buffer: Move resize integrity check under reader lock
    ring-buffer: Use sync sched protection on ring buffer resizing
    tracing: Fix wrong usage of strstrip in trace_ksyms

    Linus Torvalds
     
  • The code in xfs_free_buf() only attempts to free the b_pages array if the
    buffer is a page cache backed or page allocated buffer. The extra log buffer
    that is used when the log wraps uses pages that are allocated to a different
    log buffer, but it still has a b_pages array allocated when those pages
    are associated to with the extra buffer in xfs_buf_associate_memory.

    Hence we need to always attempt to free the b_pages array when tearing
    down a buffer, not just on buffers that are explicitly marked as page bearing
    buffers. This fixes a leak detected by the kernel memory leak code.

    Signed-off-by: Dave Chinner
    Signed-off-by: Alex Elder

    Dave Chinner
     
  • For a long time we've always stored bmap btree records in the 64bit format,
    so kill off the dead 32bit type, and make sure the 64bit type is named just
    xfs_bmbt_rec everywhere, without any size postfix.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Eric Sandeen
    Signed-off-by: Alex Elder

    Christoph Hellwig
     
  • Change all async metadata buffers to use [READ|WRITE]_META I/O types
    so that the I/O doesn't get issued immediately. This allows merging of
    adjacent metadata requests but still prioritises them over bulk data.
    This shows a 10-15% improvement in sequential create speed of small
    files.

    Don't include the log buffers in this classification - leave them as
    sync types so they are issued immediately.

    Signed-off-by: Dave Chinner
    Signed-off-by: Christoph Hellwig
    Signed-off-by: Alex Elder

    Dave Chinner
     
  • Len Brown
     
  • Due to the merge of processor_start() (declared with __cpuinit) into
    processor_add(), a section mismatch warning appears:

    WARNING: drivers/built-in.o(.text+0x4d59d): Section mismatch in reference
    from the function acpi_processor_add() to the function
    .cpuinit.text:acpi_processor_power_init()
    ...

    This patch fixes the warning by declaring processor_add() as __cpuinit
    and also declares acpi_processor_add_fs() as __cpuinit as it is only
    used in acpi_processor_add().

    Signed-off-by: Thomas Renninger
    Signed-off-by: Len Brown

    Thomas Renninger
     
  • Add an assert for inodes not added to the inode cache in xfs_ireclaim,
    to make sure we're not going to introduce something like the
    famous nfsd inode cache bug again.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Alex Elder

    Christoph Hellwig
     
  • Len Brown
     
  • Signed-off-by: Shaohua Li
    Signed-off-by: Len Brown

    Shaohua Li
     
  • Signed-off-by: Shaohua Li
    Signed-off-by: Len Brown

    Shaohua Li
     
  • v2->v1:
    .improve debug info as suggedted by Bjorn,Kenji
    .API is using uuid string as suggested by Alexey

    Add an API to execute _OSC. A lot of devices can have this method, so add a
    generic API.

    Signed-off-by: Shaohua Li
    Signed-off-by: Len Brown

    Shaohua Li
     
  • Len Brown
     
  • Len Brown
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (88 commits)
    Blackfin: Convert BUG() to use unreachable()
    Blackfin: define __NR_recvmmsg
    Blackfin: drop duplicate sched_clock
    Blackfin: NOMPU: skip DMA ICPLB hole when it is redundant
    Blackfin: MPU: add missing __init markings
    Blackfin: add support for TIF_NOTIFY_RESUME
    Blackfin: kgdb_test: clean up code a bit
    Blackfin: convert kgdbtest to proc_fops
    Blackfin: convert cyc2ns() to clocksource_cyc2ns()
    Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines
    Blackfin: drop unused ax88180 resources
    Blackfin: bf537-stamp: add ADF702x network driver resources
    Blackfin: bf537-stamp: add CAN resources
    Blackfin: bf537-stamp: add AD5258 i2c address
    Blackfin: bf537-stamp: add adau1761 i2c address
    Blackfin: bf537-stamp: add adau1371 i2c address
    Blackfin: bf537-stamp: add ADP8870 resources
    Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs
    Blackfin: bf537-stamp: update ADP5520 resources
    Blackfin: bf537-stamp: add ADXL346 orientation sensing support
    ...

    Linus Torvalds
     
  • * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
    NFSv4: Fix a regression in the NFSv4 state manager
    NFSv4: Release the sequence id before restarting a CLOSE rpc call
    nfs41: fix session fore channel negotiation
    nfs41: do not zero seqid portion of stateid on close
    nfs: run state manager in privileged mode
    nfs: make recovery state manager operations privileged
    nfs: enforce FIFO ordering of operations trying to acquire slot
    rpc: add a new priority in RPC task
    nfs: remove rpc_task argument from nfs4_find_slot
    rpc: add rpc_queue_empty function
    nfs: change nfs4_do_setlk params to identify recovery type
    nfs: do not do a LOOKUP after open
    nfs: minor cleanup of session draining

    Linus Torvalds
     
  • * 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    modpost: fix segfault with short symbol names
    module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=y
    Kbuild: clear marker out of modpost
    module: make MODULE_SYMBOL_PREFIX into a CONFIG option
    ARM: unexport symbols used to implement floating point emulation
    ARM: use unified discard definition in linker script
    x86: don't export inline function
    sparc64: don't export static inline pci_ functions

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] implement early_io{re,un}map for ia64
    [IA64] Replace old style lock initializer
    [IA64] fix SBA IOMMU to handle allocation failure properly
    [IA64] Save I-resources to ia64_sal_os_state
    [IA64] preallocate IA64_IRQ_MOVE_VECTOR

    Linus Torvalds
     
  • * 'for-2.6.33' of git://linux-nfs.org/~bfields/linux: (42 commits)
    nfsd: remove pointless paths in file headers
    nfsd: move most of nfsfh.h to fs/nfsd
    nfsd: remove unused field rq_reffh
    nfsd: enable V4ROOT exports
    nfsd: make V4ROOT exports read-only
    nfsd: restrict filehandles accepted in V4ROOT case
    nfsd: allow exports of symlinks
    nfsd: filter readdir results in V4ROOT case
    nfsd: filter lookup results in V4ROOT case
    nfsd4: don't continue "under" mounts in V4ROOT case
    nfsd: introduce export flag for v4 pseudoroot
    nfsd: let "insecure" flag vary by pseudoflavor
    nfsd: new interface to advertise export features
    nfsd: Move private headers to source directory
    vfs: nfsctl.c un-used nfsd #includes
    lockd: Remove un-used nfsd headers #includes
    s390: remove un-used nfsd #includes
    sparc: remove un-used nfsd #includes
    parsic: remove un-used nfsd #includes
    compat.c: Remove dependence on nfsd private headers
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    block: temporarily disable discard granularity

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
    net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
    ixgbe: allow tx of pre-formatted vlan tagged packets
    ixgbe: Fix 82598 premature copper PHY link indicatation
    ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
    bcm63xx_enet: fix compilation failure after get_stats_count removal
    packet: dont call sleeping functions while holding rcu_read_lock()
    tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
    ipvs: zero usvc and udest
    netfilter: fix crashes in bridge netfilter caused by fragment jumps
    ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
    sky2: leave PCI config space writeable
    sky2: print Optima chip name
    x25: Update maintainer.
    ipvs: fix synchronization on connection close
    netfilter: xtables: document minimal required version
    drivers/net/bonding/: : use pr_fmt
    can: CAN_MCP251X should depend on HAS_DMA
    drivers/net/usb: Correct code taking the size of a pointer
    drivers/net/cpmac.c: Correct code taking the size of a pointer
    drivers/net/sfc: Correct code taking the size of a pointer
    ...

    Linus Torvalds