Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 6, 2006
  1. Linux 2.6.17-rc6

    Linus Torvalds authored
Commits on Jun 5, 2006
  1. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [BRIDGE]: fix locking and memory leak in br_add_bridge
      [IRDA]: Missing allocation result check in irlap_change_speed().
      [PPPOE]: Missing result check in __pppoe_xmit().
      [NET]: Eliminate unused /proc/sys/net/ethernet
      [NETCONSOLE]: Clean up initcall warning.
      [TCP]: Avoid skb_pull if possible when trimming head
  2. @davem330

    [BRIDGE]: fix locking and memory leak in br_add_bridge

    Jiri Benc authored davem330 committed
    There are several bugs in error handling in br_add_bridge:
    - when dev_alloc_name fails, allocated net_device is not freed
    - unregister_netdev is called when rtnl lock is held
    - free_netdev is called before netdev_run_todo has a chance to be run after
      unregistering net_device
    
    Signed-off-by: Jiri Benc <jbenc@suse.cz>
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. Merge master.kernel.org:/home/rmk/linux-2.6-serial

    Linus Torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-serial:
      [SERIAL] typo: buad -> baud
  4. Merge master.kernel.org:/home/rmk/linux-2.6-mmc

    Linus Torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-mmc:
      [MMC] Prevent au1xmmc.c breakage on non-Au1200 Alchemy
      [MMC] Add maintainers entry for MMC subsystem
  5. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    Linus Torvalds authored
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 3543/1: [Fwd: PXA270 bootparams address not set]
      [ARM] Trivial typo fixes
  6. @ralfbaechle

    [MIPS] Fix sparsemem support.

    Chad Reese authored ralfbaechle committed
        
    Move memory_present() in arch/mips/kernel/setup.c. When using sparsemem
    extreme, this function does an allocate for bootmem. This would always
    fail since init_bootmem hasn't been called yet.
        
    Move memory_present after free_bootmem. This only marks actual memory
    ranges as present instead of the entire address space.
        
    Signed-off-by: Chad Reese  <creese@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  7. @ralfbaechle

    [MIPS] Fix compiler warnings (field width, unused variable)

    Atsushi Nemoto authored ralfbaechle committed
        
    Fix following warnings:
    linux/arch/mips/kernel/setup.c:432: warning: field width is not type int (arg 2)
    linux/arch/mips/kernel/setup.c:432: warning: field width is not type int (arg 4)
    linux/arch/mips/kernel/syscall.c:279: warning: unused variable `len'
    linux/arch/mips/kernel/syscall.c:280: warning: unused variable `name'
    linux/arch/mips/math-emu/dp_fint.c:32: warning: unused variable `xc'
    linux/arch/mips/math-emu/dp_flong.c:32: warning: unused variable `xc'
    linux/arch/mips/math-emu/sp_fint.c:32: warning: unused variable `xc'
    linux/arch/mips/math-emu/sp_flong.c:32: warning: unused variable `xc'
        
    (original patch by Atsushi, slight changes to the setup.c part by me.)
        
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  8. @ralfbaechle

    [MIPS] Fix sparse warnings about too big constants.

    Atsushi Nemoto authored ralfbaechle committed
        
    Fix following warnings:
    linux/arch/mips/kernel/setup.c:249:12: warning: constant 0xffffffff00000000 is so big it is unsigned long
    linux/arch/mips/kernel/cpu-bugs64.c:209:10: warning: constant 0xffffffffffffdb9a is so big it is unsigned long
    linux/arch/mips/kernel/cpu-bugs64.c:227:10: warning: constant 0xffffffffffffdb9a is so big it is unsigned long
    linux/arch/mips/kernel/cpu-bugs64.c:283:10: warning: constant 0xffffffffffffdb9a is so big it is unsigned long
    linux/arch/mips/kernel/cpu-bugs64.c:299:10: warning: constant 0xffffffffffffdb9a is so big it is unsigned long
        
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  9. @ralfbaechle

    [MIPS] Fix 64-bit build for RM7000.

    ralfbaechle authored
        
    RM7000 has 40-bit virtual / 36-bit physical address space.
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  10. @ralfbaechle

    [MIPS] IP32: Fix warnings.

    ralfbaechle authored
        
    The expressions are volatile; no need for temporary variables.
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  11. @ralfbaechle

    [MIPS] Fix non-linear memory mapping on MIPS

    Sergei Shtylyov authored ralfbaechle committed
        
    Fix the non-linear memory mapping done via remap_file_pages() -- it
    didn't work on any MIPS CPU because the page offset clashing with
    _PAGE_FILE and some other page protection bits which should have been left
    zeros for this kind of pages.
        
    Signed-off-by: Konstantin Baydarov <kbaidarov@ru.mvista.com>
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  12. @ralfbaechle

    [MIPS] SB1: Only pass1 FPUs are broken beyond recovery.

    ralfbaechle authored
        
    The wrong revision number in the check was forcing a fallback to FPU
    emulation for all SB1 cores in 2.6.
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  13. @ralfbaechle

    [MIPS] open() forces O_LARGEFILE for o32 on 64bit kernels

    Thiemo Seufer authored ralfbaechle committed
        
    open() always sets the O_LARGEFILE flag for the o32 ABI implementation
    of a 64bit kernel. The appended patch fixes it.
        
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  14. @ralfbaechle

    [MIPS] Au1xx0: fix prom_getenv() to handle YAMON style environment

    Sergei Shtylyov authored ralfbaechle committed
        
    Alchemy boards use YAMON which passes the environment variables as the
    tuples of strings (the name followed by the value) unlike PMON which
    passes "name=<val>" strings.
        
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  15. @ralfbaechle

    [MIPS] Fix swap entry for MIPS32 36-bit physical address

    Sergei Shtylyov authored ralfbaechle committed
        
    With 64-bit physical address enabled, 'swapon' was causing kernel oops on
    Alchemy CPUs (MIPS32) because of the swap entry type field corrupting the
    _PAGE_FILE bit in 'pte_low' field. So, switch to storing the swap entry in
    'pte_high' field using all its bits except _PAGE_GLOBAL and _PAGE_VALID which
    gives 25 bits for the swap entry offset.
        
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  16. @ralfbaechle

    [MIPS] Fix mprotect() syscall for MIPS32 w/36-bit physical address su…

    Sergei Shtylyov authored ralfbaechle committed
    …pport
    
        
    Fix mprotect() syscall for MIPS32 CPUs with 36-bit physical address
    support: pte_modify() macro didn't clear the hardware page protection bits
    before modifying...
        
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  17. @ralfbaechle

    [MIPS] Save write-only Config.OD from being clobbered

    Sergei Shtylyov authored ralfbaechle committed
        
    Save the Config.OD bit from being clobbered by coherency_setup(). This
    bit, when set, fixes various errata in the early steppings of Au1x00
    SOCs.  Unfortunately, the bit was write-only on the most early of them.
    In addition, also restore the bit after a wakeup from sleep.
        
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  18. @ralfbaechle

    [MIPS] Print more information if we're struck by a machine check exce…

    ralfbaechle authored
    …ption.
    
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  19. @ralfbaechle

    [MIPS] Fix declaration of smp_prepare_cpus() platform hook.

    ralfbaechle authored
        
    A while ago prom_prepare_cpus was replaced by plat_prepare_cpus but
    the declaration has stayed unchanged.
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  20. @ralfbaechle

    [MIPS] Fix modpost warning: Rename op_model_xxx to op_model_xxx_ops.

    Atsushi Nemoto authored ralfbaechle committed
        
    The modpost uses a whitelist for commonly used suffix on checking the
    section mismatch.  Adding "_ops" suffix to op_modex_xxx get rid of
    this modpost warning.
        
    WARNING: arch/mips/oprofile/oprofile.o - Section mismatch: reference to .init.text: from .data after 'op_model_mipsxx' (at offset 0x528)
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  21. @ralfbaechle

    [MIPS] Fix instable BogoMIPS on multi-issue processors.

    ralfbaechle authored
    Increase alignment of BogoMIPS loop to 8 bytes.  Having the delay loop
    overlap cache line boundaries may cause instable delays.
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  22. @ralfbaechle

    [MIPS] Ignore unresolved weak symbols in modules.

    Atsushi Nemoto authored ralfbaechle committed
        
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  23. @ralfbaechle

    [MIPS] Fix SMP now that fixup_cpu_present_map is gone.

    ralfbaechle authored
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  24. @ralfbaechle

    [MIPS] Remove duplicate declaration of cpu_online_map.

    ralfbaechle authored
        
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  25. @fmalita @davem330

    [IRDA]: Missing allocation result check in irlap_change_speed().

    fmalita authored davem330 committed
    The skb allocation may fail, which can result in a NULL pointer dereference
    in irlap_queue_xmit().
    
    Coverity CID: 434.
    
    Signed-off-by: Florin Malita <fmalita@gmail.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  26. @fmalita @davem330

    [PPPOE]: Missing result check in __pppoe_xmit().

    fmalita authored davem330 committed
    skb_clone() may fail, we should check the result.
    
    Coverity CID: 1215.
    
    Signed-off-by: Florin Malita <fmalita@gmail.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  27. @davem330

    [NET]: Eliminate unused /proc/sys/net/ethernet

    Jes Sorensen authored davem330 committed
    The /proc/sys/net/ethernet directory has been sitting empty for more than
    10 years!  Time to eliminate it!
    
    Signed-off-by: Jes Sorensen <jes@sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  28. @davem330

    [NETCONSOLE]: Clean up initcall warning.

    Matt Mackall authored davem330 committed
    From: Matt Mackall <mpm@selenic.com>
    
    netconsole is being wrong here.  If it wasn't enabled there's no error.
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  29. @herbertx @davem330

    [TCP]: Avoid skb_pull if possible when trimming head

    herbertx authored davem330 committed
    Trimming the head of an skb by calling skb_pull can cause the packet
    to become unaligned if the length pulled is odd.  Since the length is
    entirely arbitrary for a FIN packet carrying data, this is actually
    quite common.
    
    Unaligned data is not the end of the world, but we should avoid it if
    it's easily done.  In this case it is trivial.  Since we're discarding
    all of the head data it doesn't matter whether we move skb->data forward
    or back.
    
    However, it is still possible to have unaligned skb->data in general.
    So network drivers should be prepared to handle it instead of crashing.
    
    This patch also adds an unlikely marking on len < headlen since partial
    ACKs on head data are extremely rare in the wild.  As the return value
    of __pskb_trim_head is no longer ever NULL that has been removed.
    
    Signed-off-by: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  30. Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
      [PATCH] pcmcia: fix zeroing of cm4000_cs.c data
      [PATCH] pcmcia: missing pcmcia_get_socket() result check
  31. [PATCH] uml: add -ffreestanding to CFLAGS

    Jeff Dike authored Linus Torvalds committed
    From: Jeff Dike <jdike@addtoit.com>
    
    This fixes the undefined reference to strcpy seen when building modules on
    i386.  Tracked down by Al Viro.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  32. [PATCH] uml: more __user annotations

    Al Viro authored Linus Torvalds committed
    From: Al Viro <viro@zeniv.linux.org.uk>
    
    uml __user annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  33. [PATCH] uml: __user annotation in arch_prctl

    Al Viro authored Linus Torvalds committed
    From: Al Viro <viro@zeniv.linux.org.uk>
    
    fix uml/amd64 prctl()
    
    put_user() there should go to (long __user *)addr, not &addr
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  34. [PATCH] uml: fix a typo in do_uml_initcalls

    Jeff Dike authored Linus Torvalds committed
    From: Jeff Dike <jdike@addtoit.com>
    
    We had a spurious semicolon somehow.
    
    Signed-off-by: Jeff Dike <jdike@addtoit.com>
    Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Something went wrong with that request. Please try again.