Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.38-rc4
Commits on Feb 8, 2011
  1. @torvalds

    Linux 2.6.38-rc4

    torvalds authored
Commits on Feb 7, 2011
  1. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ALSA: AACI: allow writes to MAINCR to take effect
      ARM: Update mach-types
      ARM: 6652/1: ep93xx: correct the end address of the AC97 memory resource
      ARM: mxs/imx28: remove now unused clock lookup "fec.0"
      ARM: mxs: fix clock base address missing
      ARM: mxs: acknowledge gpio irq
      ARM: mach-imx/mach-mx25_3ds: Fix section type
      ARM: imx: Add VPR200 and MX51_3DS entries to uncompress.h
      ARM i.MX23: use correct register for setting the rate
      ARM i.MX23/28: remove secondary field from struct clk. It's unused
      ARM i.MX28: use correct register for setting the rate
      ARM i.MX28: fix bit operation
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (33 commits)
      Btrfs: Fix page count calculation
      btrfs: Drop __exit attribute on btrfs_exit_compress
      btrfs: cleanup error handling in btrfs_unlink_inode()
      Btrfs: exclude super blocks when we read in block groups
      Btrfs: make sure search_bitmap finds something in remove_from_bitmap
      btrfs: fix return value check of btrfs_start_transaction()
      btrfs: checking NULL or not in some functions
      Btrfs: avoid uninit variable warnings in ordered-data.c
      Btrfs: catch errors from btrfs_sync_log
      Btrfs: make shrink_delalloc a little friendlier
      Btrfs: handle no memory properly in prepare_pages
      Btrfs: do error checking in btrfs_del_csums
      Btrfs: use the global block reserve if we cannot reserve space
      Btrfs: do not release more reserved bytes to the global_block_rsv than we need
      Btrfs: fix check_path_shared so it returns the right value
      btrfs: check return value of btrfs_start_ioctl_transaction() properly
      btrfs: fix return value check of btrfs_join_transaction()
      fs/btrfs/inode.c: Add missing IS_ERR test
      btrfs: fix missing break in switch phrase
      btrfs: fix several uncheck memory allocations
      ...
  3. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix hcall tracepoint recursion
      powerpc/numa: Fix bug in unmap_cpu_from_node
      powerpc/numa: Disable VPHN on dedicated processor partitions
      powerpc/numa: Add length when creating OF properties via VPHN
      powerpc/numa: Check for all VPHN changes
      powerpc/numa: Only use active VPHN count fields
      powerpc/pseries: Remove unnecessary variable initializations in numa.c
      powerpc/pseries: Fix brace placement in numa.c
      powerpc/pseries: Fix typo in VPHN comments
      powerpc: Fix some 6xx/7xxx CPU setup functions
      powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit
      powerpc/book3e: Protect complex macro args in mmu-book3e.h
      powerpc: Fix pfn_valid() when memory starts at a non-zero address
  4. @torvalds

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

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      arm: omap4: panda: remove usb_nop_xceiv_register(v1)
      OMAP1: Fix non-working LCD on OMAP310
      OMAP3: Devkit8000: Change lcd power pin
      omap1: remove duplicated #include
      arm: mach-omap2: mux: free allocated memory on error exit
      arm: mach-omap2: board-rm680: fix rm680_vemmc regulator constraints
      OMAP: PM: SmartReflex: Fix possible null pointer read access
      OMAP: PM: SmartReflex: Fix possible memory leak
      arm: mach-omap2: voltage: debugfs: fix memory leak
      OMAP3: PM: fix save secure RAM to restore MPU power state
      OMAP: PM: SmartReflex: Add missing IS_ERR test
  5. @torvalds

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

    torvalds authored
    …nux/kernel/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, nx: Mark the ACPI resume trampoline code as +x
  6. @torvalds

    CRED: Fix memory and refcount leaks upon security_prepare_creds() fai…

    Tetsuo Handa authored torvalds committed
    …lure
    
    In prepare_kernel_cred() since 2.6.29, put_cred(new) is called without
    assigning new->usage when security_prepare_creds() returned an error.  As a
    result, memory for new and refcount for new->{user,group_info,tgcred} are
    leaked because put_cred(new) won't call __put_cred() unless old->usage == 1.
    
    Fix these leaks by assigning new->usage (and new->subscribers which was added
    in 2.6.32) before calling security_prepare_creds().
    
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    CRED: Fix BUG() upon security_cred_alloc_blank() failure

    Tetsuo Handa authored torvalds committed
    In cred_alloc_blank() since 2.6.32, abort_creds(new) is called with
    new->security == NULL and new->magic == 0 when security_cred_alloc_blank()
    returns an error.  As a result, BUG() will be triggered if SELinux is enabled
    or CONFIG_DEBUG_CREDENTIALS=y.
    
    If CONFIG_DEBUG_CREDENTIALS=y, BUG() is called from __invalid_creds() because
    cred->magic == 0.  Failing that, BUG() is called from selinux_cred_free()
    because selinux_cred_free() is not expecting cred->security == NULL.  This does
    not affect smack_cred_free(), tomoyo_cred_free() or apparmor_cred_free().
    
    Fix these bugs by
    
    (1) Set new->magic before calling security_cred_alloc_blank().
    
    (2) Handle null cred->security in creds_are_invalid() and selinux_cred_free().
    
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: remove checks for ses->status == CifsExiting
      cifs: add check for kmalloc in parse_dacl
      cifs: don't send an echo request unless NegProt has been done
      cifs: enable signing flag in SMB header when server has it on
      cifs: Possible slab memory corruption while updating extended stats (repost)
      CIFS: Fix variable types in cifs_iovec_read/write (try #2)
      cifs: fix length vs. total_read confusion in cifs_demultiplex_thread
  9. @chrismason-xx

    Btrfs: Fix page count calculation

    Yan, Zheng authored chrismason-xx committed
    take offset of start position into account when calculating page count.
    
    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
  10. Merge branch 'fixes'

    Russell King authored
  11. cifs: remove checks for ses->status == CifsExiting

    Jeff Layton authored Steve French committed
    ses->status is never set to CifsExiting, so these checks are
    always false.
    
    Tested-by: JG <jg@cms.ac>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
  12. Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 …

    Russell King authored
    …into fixes
  13. ALSA: AACI: allow writes to MAINCR to take effect

    Russell King authored
    The AACI TRM requires the MAINCR enable bit to be held zero for two
    bitclk cycles plus three apb_pclk cycles.  Use a delay of 1us to
    ensure this.
    
    Ensure that writes to MAINCR to change the addressed codec only happen
    when required, and that they take effect in a similar manner to the
    above, otherwise we seem to occasionally have stuck slot busy bits.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  14. ARM: Update mach-types

    Russell King authored
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  15. x86, nx: Mark the ACPI resume trampoline code as +x

    H. Peter Anvin authored Ingo Molnar committed
    We reserve lowmem for the things that need it, like the ACPI
    wakeup code, way early to guarantee availability.  This happens
    before we set up the proper pagetables, so set_memory_x() has no
    effect.
    
    Until we have a better solution, use an initcall to mark the
    wakeup code executable.
    
    Originally-by: Matthieu Castet <castet.matthieu@free.fr>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Matthias Hopf <mhopf@suse.de>
    Cc: rjw@sisk.pl
    Cc: Suresh Siddha <suresh.b.siddha@intel.com>
    LKML-Reference: <4D4F8019.2090104@zytor.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  16. @antonblanchard @ozbenh

    powerpc: Fix hcall tracepoint recursion

    antonblanchard authored ozbenh committed
    Spinlocks on shared processor partitions use H_YIELD to notify the
    hypervisor we are waiting on another virtual CPU. Unfortunately this means
    the hcall tracepoints can recurse.
    
    The patch below adds a percpu depth and checks it on both the entry and
    exit hcall tracepoints.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    CC: stable@kernel.org
  17. @antonblanchard @ozbenh

    powerpc/numa: Fix bug in unmap_cpu_from_node

    antonblanchard authored ozbenh committed
    When converting to the new cpumask code I screwed up:
    
    -       if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) {
    -               cpu_clear(cpu, numa_cpumask_lookup_table[node]);
    +       if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) {
    +               cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
    
    This was introduced in commit 25863de (powerpc/cpumask: Convert NUMA code
    to new cpumask API)
    
    Fix it.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Cc: <stable@kernel.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  18. @antonblanchard @ozbenh

    powerpc/numa: Disable VPHN on dedicated processor partitions

    antonblanchard authored ozbenh committed
    There is no need to start up the timer and monitor topology changes on a
    dedicated processor partition, so disable it.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  19. @antonblanchard @ozbenh

    powerpc/numa: Add length when creating OF properties via VPHN

    antonblanchard authored ozbenh committed
    The rest of the NUMA code expects an OF associativity property with
    the first cell containing the length. Without this fix all topology changes
    cause us to misparse the property and put the cpu into node 0.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  20. @antonblanchard @ozbenh

    powerpc/numa: Check for all VPHN changes

    antonblanchard authored ozbenh committed
    The hypervisor uses unsigned 1 byte counters to signal topology changes to
    the OS. Since they can wrap we need to check for any difference, not just if
    the hypervisor count is greater than the previous count.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  21. @antonblanchard @ozbenh

    powerpc/numa: Only use active VPHN count fields

    antonblanchard authored ozbenh committed
    VPHN supports up to 8 distance fields but the number of entries in
    ibm,associativity-reference-points signifies how many are in use.
    Don't look at all the VPHN counts, only distance_ref_points_depth
    worth.
    
    Since we already cap our distance metrics at MAX_DISTANCE_REF_POINTS,
    use that to size the VPHN arrays and add a BUILD_BUG_ON to avoid it growing
    larger than the VPHN maximum of 8.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  22. @ozbenh

    powerpc/pseries: Remove unnecessary variable initializations in numa.c

    Jesse Larrew authored ozbenh committed
    Remove unnecessary variable initializations in VPHN functions.
    
    Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  23. @ozbenh

    powerpc/pseries: Fix brace placement in numa.c

    Jesse Larrew authored ozbenh committed
    Fix brace placement in VPHN code.
    
    Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  24. @ozbenh

    powerpc/pseries: Fix typo in VPHN comments

    Jesse Larrew authored ozbenh committed
    Correct a spelling error in VPHN comments in numa.c.
    
    Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  25. @ozbenh

    powerpc: Fix some 6xx/7xxx CPU setup functions

    ozbenh authored
    Some of those functions try to adjust the CPU features, for example
    to remove NAP support on some revisions. However, they seem to use
    r5 as an index into the CPU table entry, which might have been right
    a long time ago but no longer is. r4 is the right register to use.
    
    This probably caused some off behaviours on some PowerMac variants
    using 750cx or 7455 processor revisions.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    CC: stable@kernel.org
  26. @ozbenh

    powerpc: Pass the right cpu_spec to ->setup_cpu() on 64-bit

    ozbenh authored
    When calling setup_cpu() on 64-bit, we pass a pointer to the
    cputable entry we have found. This used to be fine when cur_cpu_spec
    was a pointer to that entry, but nowadays, we copy the entry into
    a separate variable, and we do so before we call the setup_cpu()
    callback. That means that any attempt by that callback at patching
    the CPU table entry (to adjust CPU features for example) will patch
    the wrong table.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  27. @ozbenh

    powerpc/book3e: Protect complex macro args in mmu-book3e.h

    Scott Wood authored ozbenh committed
    Signed-off-by: Scott Wood <scottwood@freescale.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  28. @ozbenh

    powerpc: Fix pfn_valid() when memory starts at a non-zero address

    Scott Wood authored ozbenh committed
    max_mapnr is a pfn, not an index innto mem_map[].  So don't add
    ARCH_PFN_OFFSET a second time.
    
    Signed-off-by: Scott Wood <scottwood@freescale.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Commits on Feb 6, 2011
  1. @torvalds

    Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/chris/linux-2.6
    
    * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
      arm/ixp4xx: Rename FREQ macro to avoid collisions
      IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.
  2. @torvalds

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

    torvalds authored
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      lockdep, timer: Fix del_timer_sync() annotation
      RTC: Prevents a division by zero in kernel code.
  3. @torvalds

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

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      m32r: Fixup last __do_IRQ leftover
      genirq: Add missing status flags to modification mask
  4. @torvalds

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

    torvalds authored
    …inux/kernel/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:
      perf stat: Fix aggreate counter reading accounting
      tracing: Replace syscall_meta_data struct array with pointer array
      tracepoints: Fix section alignment using pointer array
      tracing: Replace trace_event struct array with pointer array
  5. @torvalds

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

    torvalds authored
    …nux/kernel/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-32: Make sure the stack is set up before we use it
      x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms
      x86, nx: Don't force pages RW when setting NX bits
  6. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: use linux/io.h to fix compile warnings
      ALSA: hda - Fix memory leaks in conexant jack arrays
      ASoC: CX20442: fix NULL pointer dereference
      ASoC: Amstrad Delta: fix const related build error
      ALSA: oxygen: fix output routing on Xonar DG
      sound: silent echo'ed messages in Makefile
      ASoC: Fix mask/val_mask confusion snd_soc_dapm_put_volsw()
      ASoC: DaVinci: fix kernel panic due to uninitialized platform_data
      ALSA: HDA: Fix microphone(s) on Lenovo Edge 13
      ASoC: Fix module refcount for auxiliary devices
      ALSA: HDA: cxt5066 - Use asus model for Asus U50F, select correct SPDIF output
      ALSA: HDA: Add a new model "asus" for Conexant 5066/205xx
      ALSA: HDA: Refactor some redundant code for Conexant 5066/205xx
Something went wrong with that request. Please try again.