01 Apr, 2012

4 commits


30 Mar, 2012

22 commits

  • Pull devicetree documentation update from Grant Likely.

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
    dt: Linux DT usage model documentation
    mtd: Move fdt partition documentation to a seperate file

    Linus Torvalds
     
  • Pull x86 cleanups from Peter Anvin:
    "The biggest textual change is the cleanup to use symbolic constants
    for x86 trap values.

    The only *functional* change and the reason for the x86/x32 dependency
    is the move of is_ia32_task() into so that it can
    be used in other code that needs to understand if a system call comes
    from the compat entry point (and therefore uses i386 system call
    numbers) or not. One intended user for that is the BPF system call
    filter. Moving it out of means we can define it
    unconditionally, returning always true on i386."

    * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h
    x86: Rename trap_no to trap_nr in thread_struct
    x86: Use enum instead of literals for trap values

    Linus Torvalds
     
  • v2: 2nd draft
    - Editorial cleanups (Randy Dunlap and Stephen Warren)
    - Added missing Microblaze reference (Stephen Neuendorffer)
    - Make example of platform_device creation clearer (Shawn Guo)
    - Expand on PowerPC history and mention i2c mess (David Gibson)
    - convert to plain text (remove bits of html formating)

    Signed-off-by: Grant Likely

    Grant Likely
     
  • Pull x32 support for x86-64 from Ingo Molnar:
    "This tree introduces the X32 binary format and execution mode for x86:
    32-bit data space binaries using 64-bit instructions and 64-bit kernel
    syscalls.

    This allows applications whose working set fits into a 32 bits address
    space to make use of 64-bit instructions while using a 32-bit address
    space with shorter pointers, more compressed data structures, etc."

    Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}

    * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
    x32: Fix alignment fail in struct compat_siginfo
    x32: Fix stupid ia32/x32 inversion in the siginfo format
    x32: Add ptrace for x32
    x32: Switch to a 64-bit clock_t
    x32: Provide separate is_ia32_task() and is_x32_task() predicates
    x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
    x86/x32: Fix the binutils auto-detect
    x32: Warn and disable rather than error if binutils too old
    x32: Only clear TIF_X32 flag once
    x32: Make sure TS_COMPAT is cleared for x32 tasks
    fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
    fs: Fix close_on_exec pointer in alloc_fdtable
    x32: Drop non-__vdso weak symbols from the x32 VDSO
    x32: Fix coding style violations in the x32 VDSO code
    x32: Add x32 VDSO support
    x32: Allow x32 to be configured
    x32: If configured, add x32 system calls to system call tables
    x32: Handle process creation
    x32: Signal-related system calls
    x86: Add #ifdef CONFIG_COMPAT to
    ...

    Linus Torvalds
     
  • Pull "ARM: cleanups of io includes" from Olof Johansson:
    "Rob Herring has done a sweeping change cleaning up all of the
    mach/io.h includes, moving some of the oft-repeated macros to a common
    location and removing a bunch of boiler plate. This is another step
    closer to a common zImage for multiple platforms."

    Fix up various fairly trivial conflicts ( removal vs changes
    around it, tegra localtimer.o is *still* gone, yadda-yadda).

    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: tegra: Include assembler.h in sleep.S to fix build break
    ARM: pxa: use common IOMEM definition
    ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
    ARM: __io abuse cleanup
    ARM: create a common IOMEM definition
    ARM: iop13xx: fix missing declaration of iop13xx_init_early
    ARM: fix ioremap/iounmap for !CONFIG_MMU
    ARM: kill off __mem_pci
    ARM: remove bunch of now unused mach/io.h files
    ARM: make mach/io.h include optional
    ARM: clps711x: remove unneeded include of mach/io.h
    ARM: dove: add explicit include of dove.h to addr-map.c
    ARM: at91: add explicit include of hardware.h to uncompressor
    ARM: ep93xx: clean-up mach/io.h
    ARM: tegra: clean-up mach/io.h
    ARM: orion5x: clean-up mach/io.h
    ARM: davinci: remove unneeded mach/io.h include
    [media] davinci: remove includes of mach/io.h
    ARM: OMAP: Remove remaining includes for mach/io.h
    ARM: msm: clean-up mach/io.h
    ...

    Linus Torvalds
     
  • This reverts commit b43d17f319f2c502b17139d1cf70731b2b62c644.

    Dave Jones reports that it causes lockups on his laptop, and his debug
    output showed a lot of processes hung waiting for page_writeback (or
    more commonly - processes hung waiting for a lock that was held during
    that writeback wait).

    The page_writeback hint made Ted suggest that Dave look at this commit,
    and Dave verified that reverting it makes his problems go away.

    Ted says:
    "That commit fixes a race which is seen when you write into fallocated
    (and hence uninitialized) disk blocks under *very* heavy memory
    pressure. Furthermore, although theoretically it could trigger under
    normal direct I/O writes, it only seems to trigger if you are issuing
    a huge number of AIO writes, such that a just-written page can get
    evicted from memory, and then read back into memory, before the
    workqueue has a chance to update the extent tree.

    This race has been around for a little over a year, and no one noticed
    until two months ago; it only happens under fairly exotic conditions,
    and in fact even after trying very hard to create a simple repro under
    lab conditions, we could only reproduce the problem and confirm the
    fix on production servers running MySQL on very fast PCIe-attached
    flash devices.

    Given that Dave was able to hit this problem pretty quickly, if we
    confirm that this commit is at fault, the only reasonable thing to do
    is to revert it IMO."

    Reported-and-tested-by: Dave Jones
    Acked-by: Theodore Ts'o
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Pull more ARM updates from Russell King.

    This got a fair number of conflicts with the split, but
    also with some other sparse-irq and header file include cleanups. They
    all looked pretty trivial, though.

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits)
    ARM: fix Kconfig warning for HAVE_BPF_JIT
    ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds
    ARM: 7349/1: integrator: convert to sparse irqs
    ARM: 7259/3: net: JIT compiler for packet filters
    ARM: 7334/1: add jump label support
    ARM: 7333/2: jump label: detect %c support for ARM
    ARM: 7338/1: add support for early console output via semihosting
    ARM: use set_current_blocked() and block_sigmask()
    ARM: exec: remove redundant set_fs(USER_DS)
    ARM: 7332/1: extract out code patch function from kprobes
    ARM: 7331/1: extract out insn generation code from ftrace
    ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format
    ARM: 7351/1: ftrace: remove useless memory checks
    ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path
    ARM: Versatile Express: add NO_IOPORT
    ARM: get rid of asm/irq.h in asm/prom.h
    ARM: 7319/1: Print debug info for SIGBUS in user faults
    ARM: 7318/1: gic: refactor irq_start assignment
    ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop
    ARM: 7315/1: perf: add support for the Cortex-A7 PMU
    ...

    Linus Torvalds
     
  • Pull cpupower updates from Dominik Brodowski.

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
    cpupower tools: add install target to the debug tools' makefiles
    cpupower tools: allow to build debug tools in a separate directory too
    cpupower: Fix broken mask values
    cpupower tool: allow to build in a separate directory
    cpupower tool: makefile: simplify the recipe used to generate cpupower.pot target
    cpupower tool: remove use of undefined variables from the clean target of the top makefile
    cpupower: Fix linking with --as-needed
    cpupower: Remove unneeded code and by that fix a memleak
    cpupower: Fix number of idle states
    cpupower: Unify cpupower-frequency-* manpages
    cpupower: Add cpupower-idle-info manpage
    cpupower: AMD fam14h/Ontario monitor can also be used by fam12h cpus
    cpupower: Better interface for accessing AMD pci registers

    Linus Torvalds
     
  • Pull a few PCMCIA updates from Dominik Brodowski.

    Fix up trivial conflict (modified code in question had been removed) in
    drivers/pcmcia/soc_common.c.

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
    pcmcia at91_cf: fix raw gpio number usage
    ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
    pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
    pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
    pcmcia: irq: Remove IRQF_DISABLED

    Linus Torvalds
     
  • Pull slave-dmaengine update from Vinod Koul:
    "This includes the cookie cleanup by Russell, the addition of context
    parameter for dmaengine APIs, more arm dmaengine driver cleanup by
    moving code to dmaengine, this time for imx by Javier and pl330 by
    Boojin along with the usual driver fixes."

    Fix up some fairly trivial conflicts with various other cleanups.

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
    dmaengine: imx: fix the build failure on x86_64
    dmaengine: i.MX: Fix merge of cookie branch.
    dmaengine: i.MX: Add support for interleaved transfers.
    dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
    dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
    dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
    dmaengine: imx-dma: remove internal structure.
    dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
    dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
    dmaengine: imx-dma: remove sg member from internal structure.
    dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
    dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
    dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
    dmaengine: imx-dma: remove dma_mode member of internal structure.
    dmaengine: imx-dma: remove data member from internal structure.
    dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
    dmaengine: at_hdmac: add slave config operation
    dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
    dmaengine/dma_slave: introduce inline wrappers
    dma: imx-sdma: Treat firmware messages as warnings instead of erros
    ...

    Linus Torvalds
     
  • Pull nfsd changes from Bruce Fields:

    Highlights:
    - Benny Halevy and Tigran Mkrtchyan implemented some more 4.1 features,
    moving us closer to a complete 4.1 implementation.
    - Bernd Schubert fixed a long-standing problem with readdir cookies on
    ext2/3/4.
    - Jeff Layton performed a long-overdue overhaul of the server reboot
    recovery code which will allow us to deprecate the current code (a
    rather unusual user of the vfs), and give us some needed flexibility
    for further improvements.
    - Like the client, we now support numeric uid's and gid's in the
    auth_sys case, allowing easier upgrades from NFSv2/v3 to v4.x.

    Plus miscellaneous bugfixes and cleanup.

    Thanks to everyone!

    There are also some delegation fixes waiting on vfs review that I
    suppose will have to wait for 3.5. With that done I think we'll finally
    turn off the "EXPERIMENTAL" dependency for v4 (though that's mostly
    symbolic as it's been on by default in distro's for a while).

    And the list of 4.1 todo's should be achievable for 3.5 as well:

    http://wiki.linux-nfs.org/wiki/index.php/Server_4.0_and_4.1_issues

    though we may still want a bit more experience with it before turning it
    on by default.

    * 'for-3.4' of git://linux-nfs.org/~bfields/linux: (55 commits)
    nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled
    nfsd4: use auth_unix unconditionally on backchannel
    nfsd: fix NULL pointer dereference in cld_pipe_downcall
    nfsd4: memory corruption in numeric_name_to_id()
    sunrpc: skip portmap calls on sessions backchannel
    nfsd4: allow numeric idmapping
    nfsd: don't allow legacy client tracker init for anything but init_net
    nfsd: add notifier to handle mount/unmount of rpc_pipefs sb
    nfsd: add the infrastructure to handle the cld upcall
    nfsd: add a header describing upcall to nfsdcld
    nfsd: add a per-net-namespace struct for nfsd
    sunrpc: create nfsd dir in rpc_pipefs
    nfsd: add nfsd4_client_tracking_ops struct and a way to set it
    nfsd: convert nfs4_client->cl_cb_flags to a generic flags field
    NFSD: Fix nfs4_verifier memory alignment
    NFSD: Fix warnings when NFSD_DEBUG is not defined
    nfsd: vfs_llseek() with 32 or 64 bit offsets (hashes)
    nfsd: rename 'int access' to 'int may_flags' in nfsd_open()
    ext4: return 32/64-bit dir name hash according to usage type
    fs: add new FMODE flags: FMODE_32bithash and FMODE_64bithash
    ...

    Linus Torvalds
     
  • Pull arch/tile (really asm-generic) update from Chris Metcalf:
    "These are a couple of asm-generic changes that apply to tile."

    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    compat: use sys_sendfile64() implementation for sendfile syscall
    [PATCH v3] ipc: provide generic compat versions of IPC syscalls

    Linus Torvalds
     
  • Pull scheduler fixes from Ingo Molnar.

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    cpusets: Remove an unused variable
    sched/rt: Improve pick_next_highest_task_rt()
    sched: Fix select_fallback_rq() vs cpu_active/cpu_online
    sched/x86/smp: Do not enable IRQs over calibrate_delay()
    sched: Fix compiler warning about declared inline after use
    MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS

    Linus Torvalds
     
  • Pull x86 updates from Ingo Molnar.

    This touches some non-x86 files due to the sanitized INLINE_SPIN_UNLOCK
    config usage.

    Fixed up trivial conflicts due to just header include changes (removing
    headers due to cpu_idle() merge clashing with the split).

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/apic/amd: Be more verbose about LVT offset assignments
    x86, tls: Off by one limit check
    x86/ioapic: Add io_apic_ops driver layer to allow interception
    x86/olpc: Add debugfs interface for EC commands
    x86: Merge the x86_32 and x86_64 cpu_idle() functions
    x86/kconfig: Remove CONFIG_TR=y from the defconfigs
    x86: Stop recursive fault in print_context_stack after stack overflow
    x86/io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y
    x86/apic: Add separate apic_id_valid() functions for selected apic drivers
    locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
    x86/kconfig: Update defconfigs
    x86: Fix excessive MSR print out when show_msr is not specified

    Linus Torvalds
     
  • Pull timer core updates from Thomas Gleixner.

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    ia64: vsyscall: Add missing paranthesis
    alarmtimer: Don't call rtc_timer_init() when CONFIG_RTC_CLASS=n
    x86: vdso: Put declaration before code
    x86-64: Inline vdso clock_gettime helpers
    x86-64: Simplify and optimize vdso clock_gettime monotonic variants
    kernel-time: fix s/then/than/ spelling errors
    time: remove no_sync_cmos_clock
    time: Avoid scary backtraces when warning of > 11% adj
    alarmtimer: Make sure we initialize the rtctimer
    ntp: Fix leap-second hrtimer livelock
    x86, tsc: Skip refined tsc calibration on systems with reliable TSC
    rtc: Provide flag for rtc devices that don't support UIE
    ia64: vsyscall: Use seqcount instead of seqlock
    x86: vdso: Use seqcount instead of seqlock
    x86: vdso: Remove bogus locking in update_vsyscall_tz()
    time: Remove bogus comments
    time: Fix change_clocksource locking
    time: x86: Fix race switching from vsyscall to non-vsyscall clock

    Linus Torvalds
     
  • Fix this build error on ia64:

    In file included from include/linux/sched.h:92,
    from arch/ia64/kernel/asm-offsets.c:9:
    include/linux/llist.h:59:25: error: asm/cmpxchg.h: No such file or directory
    make[1]: *** [arch/ia64/kernel/asm-offsets.s] Error 1

    Right now we don't seem to need any actual contents for the
    asm/cmpxchg.h to make the build work ... so leave the migration of
    xchg() and cmpxchg() to this new header file for a future patch.

    Also process.c needs (for definition of pfm_syst_info).

    Signed-off-by: Tony Luck
    Signed-off-by: Linus Torvalds

    Luck, Tony
     
  • Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely.

    That code had been moved into generic irqdomain code, but still had
    powerpc-specific code and could only be enabled on powerpc.

    * 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6:
    irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename
    irqdomain: Remove powerpc dependency from debugfs file

    Linus Torvalds
     
  • Single fix for a commit from the first batch of patches through Andrew.

    * emailed from Andrew Morton :
    pagemap: remove remaining unneeded spin_lock()

    Linus Torvalds
     
  • Commit 025c5b2451e4 ("thp: optimize away unnecessary page table
    locking") moves spin_lock() into pmd_trans_huge_lock() in order to avoid
    locking unless pmd is for thp. So this spin_lock() is a bug.

    Reported-by: Sasha Levin
    Signed-off-by: Naoya Horiguchi
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Naoya Horiguchi
     
  • Signed-off-by: Grant Likely

    Grant Likely
     
  • The debugfs code is really generic for all platforms. This patch removes the
    powerpc-specific directory reference and makes it available to all
    architectures.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • Pull the intel i915 hibernation memory corruption fix from Dave Airlie:
    "I tracked down the misc memory corruption after i915 hibernate to the
    blinking fbcon cursor, and realised the i915 driver wasn't doing the
    fbdev suspend/resume calls at all. nouveau and radeon have done these
    calls for a long time.

    This has been fairly well tested and is definitely the main culprit in
    hibernate not working."

    Yay.

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    drm/i915: suspend fbdev device around suspend/hibernate

    Linus Torvalds
     

29 Mar, 2012

14 commits

  • Otherwise, we get a warning or error similar to this when building with
    CONFIG_NFSD_V4 disabled:

    ERROR: "nfsd4_cld_block" [fs/nfsd/nfsd.ko] undefined!

    Fix this by wrapping the calls to rpc_pipefs_notifier_register and
    ..._unregister in another function and providing no-op replacements
    when CONFIG_NFSD_V4 is disabled.

    Reported-by: Paul Gortmaker
    Signed-off-by: Jeff Layton
    Signed-off-by: J. Bruce Fields

    Jeff Layton
     
  • Looking at hibernate overwriting I though it looked like a cursor,
    so I tracked down this missing piece to stop the cursor blink
    timer. I've no idea if this is sufficient to fix the hibernate
    problems people are seeing, but please test it.

    Both radeon and nouveau have done this for a long time.

    I've run this personally all night hib/resume cycles with no fails.

    Reviewed-by: Keith Packard
    Reported-by: Petr Tesarik
    Reported-by: Stanislaw Gruszka
    Reported-by: Lots of misc segfaults after hibernate across the world.
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=37142
    Tested-by: Dave Airlie
    Tested-by: Bojan Smojver
    Tested-by: Andreas Hartmann
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Dave Airlie
     
  • Pull MMC updates from Chris Ball:

    Core:
    * Support for MMC 4.5 Data Tag feature -- we tag REQ_META, so devices
    that support Data Tag will provide increased throughput for metadata.
    * Faster detection of card removal on I/O errors.

    Drivers:
    * dw_mmc now supports eMMC Power Off Notify, has PCI support, and
    implements pre_req and post_req for asynchronous requests.
    * omap_hsmmc now supports device tree.
    * esdhc now has power management support.
    * sdhci-tegra now supports Tegra30 devices.
    * sdhci-spear now supports hibernation.
    * tmio_mmc now supports using a GPIO for card detection.
    * Intel PCH now supports 8-bit bus transfers.

    * tag 'mmc-merge-for-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
    mmc: sh_mmcif: simplify bitmask macros
    mmc: sh_mobile_sdhi: support modular mmc-core with non-standard hotplug
    mmc: sh_mobile_sdhi: add a callback for board specific init code
    mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function
    mmc: sh_mobile_sdhi: do not manage PM clocks manually
    mmc: tmio_mmc: remove unused sdio_irq_enabled flag
    mmc: tmio_mmc: power status flag doesn't have to be exposed in platform data
    mmc: sh_mobile_sdhi: pass card hotplug GPIO number to TMIO MMC
    mmc: tmio_mmc: support the generic MMC GPIO card hotplug helper
    mmc: tmio: calculate the native hotplug condition only once
    mmc: simplify mmc_cd_gpio_request() by removing two parameters
    mmc: sdhci-pci: allow 8-bit bus width for Intel PCH
    mmc: sdhci: check interrupt flags in ISR again
    mmc: sdhci-pci: Add MSI support
    mmc: core: warn when card doesn't support HPI
    mmc: davinci: Poll status for small size transfers
    mmc: davinci: Eliminate spurious interrupts
    mmc: omap_hsmmc: Avoid a regulator voltage change with dt
    mmc: omap_hsmmc: Convert hsmmc driver to use device tree
    mmc: sdhci-pci: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for Medfield SDIO
    ...

    Linus Torvalds
     
  • Pull trivial exofs changes from Boaz Harrosh:
    "Just nothingness really. The big exofs changes are reserved for the
    next merge window."

    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
    exofs: Cap on the memcpy() size
    exofs: (trivial) Fix typo in super.c
    exofs: fix endian conversion in exofs_sync_fs()

    Linus Torvalds
     
  • Pull NFS client bugfixes for Linux 3.4 from Trond Myklebust

    Highlights include:
    - Fix infinite loops in the mount code
    - Fix a userspace buffer overflow in __nfs4_get_acl_uncached
    - Fix a memory leak due to a double reference count in rpcb_getport_async()

    Signed-off-by: Trond Myklebust

    * tag 'nfs-for-3.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error
    NFSv4.1: Fix layoutcommit error handling
    NFSv4: Fix two infinite loops in the mount code
    SUNRPC: Use the already looked-up xprt in rpcb_getport_async()
    NFS4.1: remove duplicate variable declaration in filelayout_clear_request_commit
    Fix length of buffer copied in __nfs4_get_acl_uncached

    Linus Torvalds
     
  • Pull squashfs updates from Phillip Lougher:
    "Add an extra mount time sanity check, plus some code cleanups and bug
    fixes."

    * tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
    Squashfs: add mount time sanity check for block_size and block_log match
    Squashfs: fix f_pos check in get_dir_index_using_offset
    Squashfs: get rid of obsolete definitions in header file
    Squashfs: remove redundant length initialisation in squashfs_lookup
    Squashfs: remove redundant length initialisation in squashfs_readdir
    Squashfs: update comment removing reference to zlib only
    Squashfs: use define instead of constant

    Linus Torvalds
     
  • Merge third batch of patches from Andrew Morton:
    - Some MM stragglers
    - core SMP library cleanups (on_each_cpu_mask)
    - Some IPI optimisations
    - kexec
    - kdump
    - IPMI
    - the radix-tree iterator work
    - various other misc bits.

    "That'll do for -rc1. I still have ~10 patches for 3.4, will send
    those along when they've baked a little more."

    * emailed from Andrew Morton : (35 commits)
    backlight: fix typo in tosa_lcd.c
    crc32: add help text for the algorithm select option
    mm: move hugepage test examples to tools/testing/selftests/vm
    mm: move slabinfo.c to tools/vm
    mm: move page-types.c from Documentation to tools/vm
    selftests/Makefile: make `run_tests' depend on `all'
    selftests: launch individual selftests from the main Makefile
    radix-tree: use iterators in find_get_pages* functions
    radix-tree: rewrite gang lookup using iterator
    radix-tree: introduce bit-optimized iterator
    fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
    nbd: rename the nbd_device variable from lo to nbd
    pidns: add reboot_pid_ns() to handle the reboot syscall
    sysctl: use bitmap library functions
    ipmi: use locks on watchdog timeout set on reboot
    ipmi: simplify locking
    ipmi: fix message handling during panics
    ipmi: use a tasklet for handling received messages
    ipmi: increase KCS timeouts
    ipmi: decrease the IPMI message transaction time in interrupt mode
    ...

    Linus Torvalds
     
  • Fix typo in drivers/video/backlight/tosa_lcd.c
    "tosa_lcd_reume" should be "tosa_lcd_resume".

    Signed-off-by: Masanari Iida
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Masanari Iida
     
  • Add help text to the crc32 algorithm selection option in Kconfig.

    Signed-off-by: Darrick J. Wong
    Reported-by: Stefan Richter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Darrick J. Wong
     
  • hugepage-mmap.c, hugepage-shm.c and map_hugetlb.c in Documentation/vm are
    simple pass/fail tests, It's better to promote them to
    tools/testing/selftests.

    Thanks suggestion of Andrew Morton about this. They all need firstly
    setting up proper nr_hugepages and hugepage-mmap need to mount hugetlbfs.
    So I add a shell script run_vmtests to do such work which will call the
    three test programs and check the return value of them.

    Changes to original code including below:
    a. add run_vmtests script
    b. return error when read_bytes mismatch with writed bytes.
    c. coding style fixes: do not use assignment in if condition

    [akpm@linux-foundation.org: build the targets before trying to execute them]
    [akpm@linux-foundation.org: Documentation/vm/ no longer has a Makefile. Fixes "make clean"]
    Signed-off-by: Dave Young
    Cc: Wu Fengguang
    Cc: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Frederic Weisbecker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dave Young
     
  • We have tools/vm/ folder for vm tools, so move slabinfo.c from tools/slub/
    to tools/vm/

    Signed-off-by: Dave Young
    Cc: Wu Fengguang
    Acked-by: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Frederic Weisbecker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dave Young
     
  • tools/ is the better place for vm tools which are used by many people.
    Moving them to tools also make them open to more users instead of hide in
    Documentation folder.

    This patch moves page-types.c to tools/vm/page-types.c. Also add a
    Makefile in tools/vm and fix two coding style problems: a) change const
    arrary to 'const char * const', b) change a space to tab for indent.

    Signed-off-by: Dave Young
    Acked-by: Wu Fengguang
    Cc: Christoph Lameter
    Cc: Pekka Enberg
    Cc: Frederic Weisbecker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dave Young
     
  • So a "make run_tests" will build the tests before trying to run them.

    Acked-by: Frederic Weisbecker
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Remove the run_tests script and launch the selftests by calling "make
    run_tests" from the selftests top directory instead. This delegates to
    the Makefile in each selftest directory, where it is decided how to launch
    the local test.

    This removes the need to add each selftest directory to the now removed
    "run_tests" top script.

    Signed-off-by: Frederic Weisbecker
    Cc: Dave Young
    Cc: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Frederic Weisbecker