04 Aug, 2012

24 commits

  • The pdflush thread is long gone, so this patch removes references to pdflush
    from drbd comments.

    Cc: drbd-dev@lists.linbit.com
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from ntfs.

    Cc: KONISHI Ryusuke
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from hfs.

    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The pdflush thread is long gone, so this patch removes references to pdflush
    from vfs comments.

    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from various jbd and jbd2.

    Cc: Andrew Morton
    Cc: Jan Kara
    Cc: "Theodore Ts'o"
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The pdflush thread is long gone, so this patch removes references to pdflush
    from btrfs comments.

    Cc: Chris Mason
    Cc: linux-btrfs@vger.kernel.org
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from btrfs.

    Cc: Chris Mason
    Cc: linux-btrfs@vger.kernel.org
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The pdflush thread is long gone, so this patch removes references to pdflush
    from ext4 comments.

    Cc: "Theodore Ts'o"
    Cc: Andreas Dilger
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from ext3.

    Cc: "Theodore Ts'o"
    Cc: Andreas Dilger
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from ext3.

    Cc: Jan Kara
    Cc: Andrew Morton
    Cc: Andreas Dilger
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The pdflush thread is long gone, however we still mention it incorrectly in the
    kernel documentation. This patch fixes the situation.

    Cc: Randy Dunlap
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • The '->write_super' superblock method is gone, and this patch removes all the
    references to 'write_super' from various pieces of the kernel documentation.

    Cc: Randy Dunlap
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • Finally we can kill the 'sync_supers' kernel thread along with the
    '->write_super()' superblock operation because all the users are gone.
    Now every file-system is supposed to self-manage own superblock and
    its dirty state.

    The nice thing about killing this thread is that it improves power management.
    Indeed, 'sync_supers' is a source of monotonic system wake-ups - it woke up
    every 5 seconds no matter what - even if there were no dirty superblocks and
    even if there were no file-systems using this service (e.g., btrfs and
    journalled ext4 do not need it). So it was wasting power most of the time. And
    because the thread was in the core of the kernel, all systems had to have it.
    So I am quite happy to make it go away.

    Interestingly, this thread is a left-over from the pdflush kernel thread which
    was a self-forking kernel thread responsible for all the write-back in old
    Linux kernels. It was turned into per-block device BDI threads, and
    'sync_supers' was a left-over. Thus, R.I.P, pdflush as well.

    Signed-off-by: Artem Bityutskiy
    Signed-off-by: Al Viro

    Artem Bityutskiy
     
  • Pull exofs update from Boaz Harrosh:
    "They are all mostly fixes, except the most important patch by Artem
    Bityutskiy which removes the use of s_dirt. After this patch s_dirt
    can be completely removed from the tree."

    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
    ore: Fix out-of-bounds access in _ios_obj()
    exofs: Use proper max_IO calculations from ore
    exofs: Fix __r4w_get_page when offset is beyond i_size
    exofs: stop using s_dirt
    exofs: readpage_strip: Add a BUG_ON to check for PageLocked(page)

    Linus Torvalds
     
  • Pull KVM bug fixes from Marcelo Tosatti:
    - Fix DS/ES segment register corruption on x86_32.
    - Fix kvmclock wallclock migration offset.
    - Fix PIT interrupt ACK vs system reset logic bug.

    * git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: VMX: Fix ds/es corruption on i386 with preemption
    KVM: x86: apply kvmclock offset to guest wall clock time
    KVM: PIC: call ack notifiers for irqs that are dropped form irr

    Linus Torvalds
     
  • Pull sound fixes from Takashi Iwai:
    "A bunch of small fixes for ASoC, mainly against regressions due to the
    defaulting regmap i/o, in addition to a HD-audio fixup."

    * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ASoC: core: Fix check before defaulting to regmap
    ALSA: hda - Support dock on Lenovo Thinkpad T530 with ALC269VC
    ASoC: wm8962: Allow VMID time to fully ramp
    ASoC: AC97 doesn't use regmap by default
    ASoC: sgtl5000: enable VAG_POWER for LINE_IN
    ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements
    ASoC: omap: Add missing modules aliases to get sound working on omap devices
    sound: tegra_alc5632: Adjust to of_get_named_gpio() change
    sound: tegra_wm8903: Adjust to of_get_named_gpio() change
    ASoC: mc13783: Provide codec->control_data
    ASoC: ux500: Include the correct header files
    ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
    ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe
    ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work
    ASoC: mxs-saif: fix clock prepare and enable unbalance issue
    ASoC: wm8994: Ensure there are enough BCLKs for four channels

    Linus Torvalds
     
  • Pull futex fixes from Ingo Molnar:
    "A couple of futex fixes from Darren Hart: two bugs reported by Dave
    Jones (found with his trinity test) and Dan Carpenter through static
    analysis. The third found while debugging the first two."

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
    futex: Fix bug in WARN_ON for NULL q.pi_state
    futex: Test for pi_mutex on fault in futex_wait_requeue_pi()

    Linus Torvalds
     
  • Pull x86 fixes from Ingo Molnar:
    "Various fixes"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86-64, kcmp: The kcmp system call can be common
    arch/x86/kernel/kdebugfs.c: Ensure a consistent return value in error case
    x86/mce: Add quirk for instruction recovery on Sandy Bridge processors
    x86/mce: Move MCACOD defines from mce-severity.c to
    x86/ioapic: Fix NULL pointer dereference on CPU hotplug after disabling irqs
    x86, nops: Missing break resulting in incorrect selection on Intel
    x86: CONFIG_CC_STACKPROTECTOR=y is no longer experimental

    Linus Torvalds
     
  • Pull timer fixes from Ingo Molnar:
    "One regression fix, and a couple of cleanups that clean up the code
    flow in areas that had high-profile bugs recently."

    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    time: Remove all direct references to timekeeper
    time: Clean up offs_real/wall_to_mono and offs_boot/total_sleep_time updates
    time: Clean up stray newlines
    time/jiffies: Rename ACTHZ to SHIFTED_HZ
    time/jiffies: Allow CLOCK_TICK_RATE to be undefined
    time: Fix casting issue in tk_set_xtime and tk_xtime_add

    Linus Torvalds
     
  • Pull scheduler fixes from Ingo Molnar:
    "Fixes and two late cleanups"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched/cleanups: Add load balance cpumask pointer to 'struct lb_env'
    sched: Fix comment about PREEMPT_ACTIVE bit location
    sched: Fix minor code style issues
    sched: Use task_rq_unlock() in __sched_setscheduler()
    sched/numa: Add SD_PERFER_SIBLING to CPU domain

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "Fix merge window fallout and fix sleep profiling (this was always
    broken, so it's not a fix for the merge window - we can skip this one
    from the head of the tree)."

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf/trace: Add ability to set a target task for events
    perf/x86: Fix USER/KERNEL tagging of samples properly
    perf/x86/intel/uncore: Make UNCORE_PMU_HRTIMER_INTERVAL 64-bit

    Linus Torvalds
     
  • Pull irq fix from Ingo Molnar.

    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    genirq: Allow irq chips to mark themself oneshot safe

    Linus Torvalds
     
  • Pull KGDB/KDB/usb-dbgp fixes and cleanups from Jason Wessel:
    "There are no new features, those will be delayed to the 3.7 window.
    There are only fixes/cleanup against the usual kernel churn and we are
    removing more lines than we add:

    - usb-dbgp - increase the controller wait time to come out of halt.
    - kdb - Remove unused KDB_FLAG_ONLY_DO_DUMP code and cpu in more prompt
    - debug core - pass NMI type on archs that provide NMI types"

    * tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
    USB: echi-dbgp: increase the controller wait time to come out of halt.
    kernel/debug: Make use of KGDB_REASON_NMI
    kdb: Remove cpu from the more prompt
    kdb: Remove unused KDB_FLAG_ONLY_DO_DUMP

    Linus Torvalds
     
  • Pull m68k updates from Geert Uytterhoeven.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k: Make sys_atomic_cmpxchg_32 work on classic m68k
    m68k/apollo: Rename "timer" to "apollo_timer"
    zorro: Remove unused zorro_bus.devices
    m68k: Remove never used asm/shm.h
    m68k/sun3: Remove unselectable code in prom_init()
    m68k: Use asm-generic version of
    m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop}
    mtd/uclinux: Use generic __bss_stop instead of _ebss
    m68knommu: Allow ColdFire CPUs to use unaligned accesses
    m68k: Remove five unused headers
    m68k: CPU32 does not support unaligned accesses
    m68k: Introduce config option CPU_HAS_NO_UNALIGNED
    m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64
    m68k: Move CPU_HAS_* config options
    m68k: Remove duplicate FPU config option
    m68knommu: Clean up printing of sections
    m68k: Use asm-generic version of
    m68k: Use Kbuild logic to import asm-generic headers

    Linus Torvalds
     

03 Aug, 2012

16 commits

  • Linus Torvalds
     
  • User space access must always go through uaccess accessors, since on
    classic m68k user space and kernel space are completely separate.

    Signed-off-by: Andreas Schwab
    Tested-by: Thorsten Glaser
    Signed-off-by: Geert Uytterhoeven
    Cc: stable@vger.kernel.org

    Andreas Schwab
     
  • Pull OLPC platform updates from Andres Salomon:
    "These move the OLPC Embedded Controller driver out of
    arch/x86/platform and into drivers/platform/olpc.

    OLPC machines are now ARM-based (which means lots of x86 and ARM
    changes), but are typically pretty self-contained.. so it makes more
    sense to go through a separate OLPC tree after getting the appropriate
    review/ACKs."

    * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc:
    x86: OLPC: move s/r-related EC cmds to EC driver
    Platform: OLPC: move global variables into priv struct
    Platform: OLPC: move debugfs support from x86 EC driver
    x86: OLPC: switch over to using new EC driver on x86
    Platform: OLPC: add a suspended flag to the EC driver
    Platform: OLPC: turn EC driver into a platform_driver
    Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it
    drivers: OLPC: update various drivers to include olpc-ec.h
    Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver

    Linus Torvalds
     
  • Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
    "This contains a set of device-tree conversions for Marvell Orion
    platforms that were staged early but took a few tries to get the
    branch into a format where it was suitable for us to pick up.

    Given that most people working on these platforms are hobbyists with
    limited time, we were a bit more flexible with merging it even though
    it came in late."

    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
    ARM: Kirkwood: Replace mrvl with marvell
    ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
    ARM: Kirkwood: Describe Dreamplug LEDs in DT.
    ARM: Kirkwood: Describe iConnects LEDs in DT.
    ARM: Kirkwood: Describe iConnects temperature sensor in DT.
    ARM: Kirkwood: Describe IB62x0 LEDs in DT.
    ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
    ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
    ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
    ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
    ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
    ARM: Kirkwood: Use DT to configure SATA device.
    ARM: kirkwood: use devicetree for SPI on dreamplug
    ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
    ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
    ARM: Kirkwood: Add basic device tree support for QNAP TS219.
    ATA: sata_mv: Add device tree support
    ARM: Orion: DTify the watchdog timer.
    ARM: Orion: Add arch support needed for I2C via DT.
    ARM: kirkwood: use devicetree for orion-spi
    ...

    Conflicts:
    drivers/watchdog/orion_wdt.c

    Linus Torvalds
     
  • Pull arm-soc cpuidle enablement for OMAP from Olof Johansson:
    "Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree,
    but didn't go in because the pull request ended up rejected. So it
    just got merged, and we got this staged branch that enables the
    coupled cpuidle code on OMAP.

    With a stable git workflow from the other maintainer we could have
    staged this earlier, but that wasn't the case so we have had to merge
    it late.

    The alternative is to hold it off until 3.7 but given that the code is
    well-isolated to OMAP and they are eager to see it go in, I didn't
    push back hard in that direction."

    * tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: OMAP4: CPUidle: Open broadcast clock-event device.
    ARM: OMAP4: CPUidle: add synchronization for coupled idle states
    ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
    ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A few fixes for merge window fallout, and a bugfix for timer resume on
    PRIMA2."

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: mmp: add missing irqs.h
    arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs
    ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
    ARM: mxc: Include missing irqs.h header

    Linus Torvalds
     
  • Pull SuperH fixes from Paul Mundt.

    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (24 commits)
    sh: explicitly include sh_dma.h in setup-sh7722.c
    sh: ecovec: care CN5 VBUS if USB host mode
    sh: sh7724: fixup renesas_usbhs clock settings
    sh: intc: initial irqdomain support.
    sh: pfc: Fix up init ordering mess.
    serial: sh-sci: fix compilation breakage, when DMA is enabled
    dmaengine: shdma: restore partial transfer calculation
    sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
    sh: Fix up recursive fault in oops with unset TTB.
    sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
    sh: select the fixed regulator driver on several boards
    sh: ecovec: switch MMC power control to regulators
    sh: add fixed voltage regulators to se7724
    sh: add fixed voltage regulators to sdk7786
    sh: add fixed voltage regulators to rsk
    sh: add fixed voltage regulators to migor
    sh: add fixed voltage regulators to kfr2r09
    sh: add fixed voltage regulators to ap325rxa
    sh: add fixed voltage regulators to sh7757lcr
    sh: add fixed voltage regulators to sh2007
    ...

    Linus Torvalds
     
  • Pull additional md update from NeilBrown:
    "This contains a few patches that depend on plugging changes in the
    block layer so needed to wait for those.

    It also contains a Kconfig fix for the new RAID10 support in dm-raid."

    * tag 'md-3.6' of git://neil.brown.name/md:
    md/dm-raid: DM_RAID should select MD_RAID10
    md/raid1: submit IO from originating thread instead of md thread.
    raid5: raid5d handle stripe in batch way
    raid5: make_request use batch stripe release

    Linus Torvalds
     
  • Pull two ceph fixes from Sage Weil:
    "The first patch fixes up the old crufty open intent code to use the
    atomic_open stuff properly, and the second fixes a possible null deref
    and memory leak with the crypto keys."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    libceph: fix crypto key null deref, memory leak
    ceph: simplify+fix atomic_open

    Linus Torvalds
     
  • Pull ecryptfs fixes from Tyler Hicks:
    - Fixes a bug when the lower filesystem mount options include 'acl',
    but the eCryptfs mount options do not
    - Cleanups in the messaging code
    - Better handling of empty files in the lower filesystem to improve
    usability. Failed file creations are now cleaned up and empty lower
    files are converted into eCryptfs during open().
    - The write-through cache changes are being reverted due to bugs that
    are not easy to fix. Stability outweighs the performance
    enhancements here.
    - Improvement to the mount code to catch unsupported ciphers specified
    in the mount options

    * tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
    eCryptfs: check for eCryptfs cipher support at mount
    eCryptfs: Revert to a writethrough cache model
    eCryptfs: Initialize empty lower files when opening them
    eCryptfs: Unlink lower inode when ecryptfs_create() fails
    eCryptfs: Make all miscdev functions use daemon ptr in file private_data
    eCryptfs: Remove unused messaging declarations and function
    eCryptfs: Copy up POSIX ACL and read-only flags from lower mount

    Linus Torvalds
     
  • Pull CIFS update from Steve French:
    "Adds SMB2 rmdir/mkdir capability to the SMB2/SMB2.1 support in cifs.

    I am holding up a few more days on merging the remainder of the
    SMB2/SMB2.1 enablement although it is nearing review completion, in
    order to address some review comments from Jeff Layton on a few of the
    subsequent SMB2 patches, and also to debug an unrelated cifs problem
    that Pavel discovered."

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
    CIFS: Add SMB2 support for rmdir
    CIFS: Move rmdir code to ops struct
    CIFS: Add SMB2 support for mkdir operation
    CIFS: Separate protocol specific part from mkdir
    CIFS: Simplify cifs_mkdir call

    Linus Torvalds
     
  • Borislav Petkov reports that the new warning added in commit
    88fdf75d1bb5 ("mm: warn if pg_data_t isn't initialized with zero")
    triggers for him, and it is the node_start_pfn field that has already
    been initialized once.

    The call trace looks like this:

    x86_64_start_kernel ->
    x86_64_start_reservations ->
    start_kernel ->
    setup_arch ->
    paging_init ->
    zone_sizes_init ->
    free_area_init_nodes ->
    free_area_init_node

    and (with the warning replaced by debug output), Borislav sees

    On node 0 totalpages: 4193848
    DMA zone: 64 pages used for memmap
    DMA zone: 6 pages reserved
    DMA zone: 3890 pages, LIFO batch:0
    DMA32 zone: 16320 pages used for memmap
    DMA32 zone: 798464 pages, LIFO batch:31
    Normal zone: 52736 pages used for memmap
    Normal zone: 3322368 pages, LIFO batch:31
    free_area_init_node: pgdat->node_start_pfn: 4423680 node_start_pfn: 8617984 node_start_pfn: 12812288
    Cc: Minchan Kim
    Cc: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • arch/arm/mach-mmp/gplugd.c:195:13: error: ‘MMP_NR_IRQS’ undeclared here
    (not in a function)
    make[1]: *** [arch/arm/mach-mmp/gplugd.o] Error 1

    Include to fix this issue.

    Signed-off-by: Haojian Zhuang
    Signed-off-by: Olof Johansson

    Haojian Zhuang
     
  • The comment was wrongly referring to Armada 370 while the file is
    related to Armada XP.

    Signed-off-by: Thomas Petazzoni
    Signed-off-by: Olof Johansson

    Thomas Petazzoni
     
  • The only way to write LATCHED registers to write LATCH_BIT to LATCH register,
    that will latch COUNTER into LATCHED.e.g.
    writel_relaxed(SIRFSOC_TIMER_LATCH_BIT, sirfsoc_timer_base +
    SIRFSOC_TIMER_LATCH);

    Writing values to LATCHED registers directly is useless at all.

    Signed-off-by: Barry Song
    Signed-off-by: Olof Johansson

    Barry Song
     
  • Avoid crashing if the crypto key payload was NULL, as when it was not correctly
    allocated and initialized. Also, avoid leaking it.

    Signed-off-by: Sylvain Munaut
    Signed-off-by: Sage Weil
    Reviewed-by: Alex Elder

    Sylvain Munaut