Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-git1

Feb 24, 2010

  1. security: fix error return path in ima_inode_alloc

    If radix_tree_preload is failed in ima_inode_alloc, we don't need
    radix_tree_preload_end because kernel is alread preempt enabled
    
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: James Morris <jmorris@namei.org>
    Xiaotian Feng authored James Morris committed
  2. Linus Torvalds

    Linux 2.6.33

    torvalds authored
  3. Linus Torvalds

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

    …t/kyle/parisc-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      parisc: Set PCI CLS early in boot.
    torvalds authored
  4. Linus Torvalds

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

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Fix broken sn2 build
    torvalds authored
  5. parisc: Set PCI CLS early in boot.

    Set the PCI CLS early in the boot process to prevent
    device failures. In pcibios_set_master use the new
    pci_cache_line_size instead of a hard-coded value.
    
    Signed-off-by: Carlos O'Donell <carlos@codesourcery.com>
    Reviewed-by: Grant Grundler <grundler@google.com>
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Carlos O'Donell authored Kyle McMartin committed
  6. Linus Torvalds

    Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: Fix out_le32() macro
      microblaze: Fix cache loop function for cache range
    torvalds authored
  7. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      Revert "block: improve queue_should_plug() by looking at IO depths"
    torvalds authored
  8. smagnani

    microblaze: Fix out_le32() macro

    Trailing semicolon causes compilation involving out_le32() to fail.
    
    Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    smagnani authored michalsimek committed
  9. michalsimek

    microblaze: Fix cache loop function for cache range

    I create wrong asm code but none test shows that this part of code is wrong.
    I am not convinces that were good idea to create asm optimized macros
    for caches. The reason is that there is not optimization with previous code
    that's why make sense to add old code and do some benchmarking which
    functions are faster.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek authored
  10. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      net: bug fix for vlan + gro issue
      tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
      cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
      IPv6: better document max_addresses parameter
      MAINTAINERS: update mv643xx_eth maintenance status
      e1000: Fix DMA mapping error handling on RX
      iwlwifi: sanity check before counting number of tfds can be free
      iwlwifi: error checking for number of tfds in queue
      iwlwifi: set HT flags after channel in rxon
    torvalds authored
  11. net: bug fix for vlan + gro issue

    Traffic (tcp) doesnot start on a vlan interface when gro is enabled.
    Even the tcp handshake was not taking place.
    This is because, the eth_type_trans call before the netif_receive_skb
    in napi_gro_finish() resets the skb->dev to napi->dev from the previously
    set vlan netdev interface. This causes the ip_route_input to drop the
    incoming packet considering it as a packet coming from a martian source.
    
    I could repro this on 2.6.32.7 (stable) and 2.6.33-rc7.
    With this fix, the traffic starts and the test runs fine on both vlan
    and non-vlan interfaces.
    
    CC: Herbert Xu <herbert@gondor.apana.org.au>
    CC: Patrick McHardy <kaber@trash.net>
    Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ajit Khaparde authored davem330 committed
  12. Linus Torvalds

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

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: Be in TS_POLLING state during mwait based C-state entry
      ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
      acer-wmi: Respect current backlight level when loading
    torvalds authored
  13. Linus Torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
      drm/nv50: fix vram ptes on IGPs to point at stolen system memory
      drm/nv50: fix instmem binding on IGPs to point at stolen system memory
      drm/nv50: improve vram page table construction
      drm/nv50: more efficient clearing of gpu page table entries
      drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
      drm/nouveau: Fix up pre-nv17 analog load detection.
    torvalds authored
  14. [IA64] Fix broken sn2 build

    Revert the change made to arch/ia64/sn/kernel/setup.c by commit
    204fba4 as it breaks the build.
    
    Fixing the build the b94b080 way
    breaks xpc because genksyms then fails to generate an CRC for
    per_cpu____sn_cnodeid_to_nasid because of limitations in the
    generic genksyms code.
    
    Signed-off-by: Hedi Berriche <hedi@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Hedi Berriche authored Tony Luck committed

Feb 23, 2010

  1. davem330

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

    …t/linville/wireless-2.6
    davem330 authored
  2. tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON

    The netif_wake_queue() is called correctly (i.e. only on !txfull
    condition) from txdone routine.  So Unconditional call to the
    netif_wake_queue() here is wrong.  This might cause calling of
    start_xmit routine on txfull state and trigger BUG_ON.
    
    This bug does not happen when NAPI disabled.  After txdone there
    must be at least one free tx slot.  But with NAPI, this is not
    true anymore and the BUG_ON can hits on heavy load.
    
    In this driver NAPI was enabled on 2.6.33-rc1 so this is
    regression from 2.6.32 kernel.
    
    Reported-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Atsushi Nemoto authored davem330 committed
  3. cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)

    This patch adds a new vid/pid to the cdc_ether whitelist.
    
    Device added:
    - Ericsson Mobile Broadband variant C3607w
    
    Signed-off-by: Torgny Johansson <torgny.johansson@gmail.com>
    
    --
    To unsubscribe from this list: send the line "unsubscribe netdev" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Torgny Johansson authored davem330 committed
  4. Brian Haley

    IPv6: better document max_addresses parameter

    Andrew Morton wrote:
    >> >From ip-sysctl.txt file in kernel documentation I can see following description
    >> for max_addresses:
    >> max_addresses - INTEGER
    >>         Number of maximum addresses per interface.  0 disables limitation.
    >>         It is recommended not set too large value (or 0) because it would
    >>         be too easy way to crash kernel to allow to create too much of
    >>         autoconfigured addresses.
               ^^^^^^^^^^^^^^
    
    >> If this parameter applies only for auto-configured IP addressed, please state
    >> it more clearly in docs or rename the parameter to show that it refers to
    >> auto-configuration.
    
    It did mention autoconfigured in the text, but the below makes it more obvious.
    
    More clearly document IPv6 max_addresses parameter.
    
    Signed-off-by: Brian Haley <brian.haley@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    brianphaley authored davem330 committed
  5. Lennert Buytenhek

    MAINTAINERS: update mv643xx_eth maintenance status

    I am no longer with Marvell.
    
    Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    buytenh authored davem330 committed
  6. Anton Blanchard

    e1000: Fix DMA mapping error handling on RX

    Check for error return from pci_map_single/pci_map_page and clean up.
    
    With this and the previous patch the driver was able to handle a significant
    percentage of errors (I set the fault injection rate to 10% and could still
    download large files at a reasonable speed).
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    antonblanchard authored davem330 committed
  7. Revert "block: improve queue_should_plug() by looking at IO depths"

    This reverts commit fb1e753.
    
    "Benjamin S." <sbenni@gmx.de> reports that the patch in question
    causes a big drop in sequential throughput for him, dropping from
    200MB/sec down to only 70MB/sec.
    
    Needs to be investigated more fully, for now lets just revert the
    offending commit.
    
    Conflicts:
    
    	include/linux/blkdev.h
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Jens Axboe authored
  8. drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.

    Intercept query commands and apply relocations to their guest pointers.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Thomas Hellstrom authored Dave Airlie committed
  9. Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into…

    … drm-linus
    
    * 'nouveau/for-airlied' of ../drm-nouveau-next:
      drm/nv50: fix vram ptes on IGPs to point at stolen system memory
      drm/nv50: fix instmem binding on IGPs to point at stolen system memory
      drm/nv50: improve vram page table construction
      drm/nv50: more efficient clearing of gpu page table entries
      drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
      drm/nouveau: Fix up pre-nv17 analog load detection.
    Dave Airlie authored
  10. Len Brown

    Merge branch 'pcc' into release

    lenb authored
  11. Len Brown

    Merge branches 'bugzilla-14207' and 'idle' into release

    lenb authored
  12. Linus Torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: BCM47xx: Fix 128MB RAM support
      MIPS: Highmem: Fix build error
    torvalds authored
  13. Linus Torvalds

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

    …/kernel/git/frob/linux-2.6-roland
    
    * 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
      Revert "parisc: HAVE_ARCH_TRACEHOOK"
    torvalds authored
  14. Michael Neuling

    fs/exec.c: fix initial stack reservation

    803bf5e ("fs/exec.c: restrict initial
    stack space expansion to rlimit") attempts to limit the initial stack to
    20*PAGE_SIZE.  Unfortunately, in attempting ensure the stack is not
    reduced in size, we ended up not changing the stack at all.
    
    This size reduction check is not necessary as the expand_stack call does
    this already.
    
    This caused a regression in UML resulting in most guest processes being
    killed.
    
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
    Cc: Anton Blanchard <anton@samba.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Serge Hallyn <serue@us.ibm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Jouni Malinen <j@w1.fi>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    mikey authored torvalds committed
  15. Marcin Ślusarz

    efifb: fix framebuffer handoff

    Commit 4410f39 ("fbdev: add support for
    handoff from firmware to hw framebuffers") didn't add fb_destroy
    operation to efifb.  Fix it and change aperture_size to match size
    passed to request_mem_region.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15151
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Reported-by: Alex Zhavnerchik <alex.vizor@gmail.com>
    Tested-by: Alex Zhavnerchik <alex.vizor@gmail.com>
    Acked-by: Peter Jones <pjones@redhat.com>
    Cc: Huang Ying <ying.huang@intel.com>
    Cc: Dave Airlie <airlied@redhat.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    mslusarz authored torvalds committed
  16. geode-mfgpt: restore previous behavior for selecting IRQ

    geode-mfgpt: restore previous behavior for selecting IRQ
    
    The MFGPT IRQ used to be, in order of decreasing priority,
     * IRQ supplied by the user as a boot-time parameter,
     * IRQ previously set by the BIOS or another driver,
     * default IRQ given at compile time.
    
    Return to this behavior, which got broken when splitting the
    MFGPT/clocksource driver for 2.6.33-rc1.
    
    Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
    Acked-by: Andres Salomon <dilinger@collabora.co.uk>
    Cc: Jordan Crouse <jordan.crouse@amd.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: john stultz <johnstul@us.ibm.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jens Rottmann authored torvalds committed
  17. idr: fix a critical misallocation bug, take#2

    This is retry of reverted 859ddf0
    ("idr: fix a critical misallocation bug") which contained two bugs.
    
    * pa[idp->layers] should be cleared even if it's not used by
      sub_alloc() because it's used by mark idr_mark_full().
    
    * The original condition check also assigned pa[l] to p which the new
      code didn't do thus leaving p pointing at the wrong layer.
    
    Both problems have been fixed and the idr code has received good amount
    testing using userland testing setup where simple bitmap allocator is
    run parallel to verify the result of idr allocation.
    
    The bug this patch fixes is caused by sub_alloc() optimization path
    bypassing out-of-room condition check and restarting allocation loop
    with starting value higher than maximum allowed value.  For detailed
    description, please read commit message of 859ddf0.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Based-on-patch-from: Eric Paris <eparis@redhat.com>
    Reported-by: Eric Paris <eparis@redhat.com>
    Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
    Tested-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Tejun Heo authored torvalds committed
  18. kernel/sys.c: fix missing rcu protection for sys_getpriority()

    find_task_by_vpid() is not safe without rcu_read_lock().  2.6.33-rc7 got
    RCU protection for sys_setpriority() but missed it for sys_getpriority().
    
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Tetsuo Handa authored torvalds committed
  19. memcg: fix oom killing a child process in an other cgroup

    Presently the oom-killer is memcg aware and it finds the worst process
    from processes under memcg(s) in oom.  Then, it kills victim's child
    first.
    
    It may kill a child in another cgroup and may not be any help for
    recovery.  And it will break the assumption users have.
    
    This patch fixes it.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
    Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Acked-by: David Rientjes <rientjes@google.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    KAMEZAWA Hiroyuki authored torvalds committed
  20. drm/nv50: fix vram ptes on IGPs to point at stolen system memory

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Ben Skeggs authored
  21. drm/nv50: fix instmem binding on IGPs to point at stolen system memory

    This also modifies the unused PRAMIN PT entries to be all zeroes, can't
    really recall why I used 9/0 initially, just that it didn't work for
    some reason.  It was likely masking a bug elsewhere that's since been
    fixed.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Ben Skeggs authored
Something went wrong with that request. Please try again.