1. 08 May, 2006 2 commits
    • Martin Habets's avatar
      [SPARC]: Remove duplicate symbol exports · bb3426ad
      Martin Habets authored
      This patch resolves the following build warnings seen in 2.6.17-rc3:
      WARNING: vmlinux: 'sys_close' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'memchr' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strrchr' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strchr' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strncat' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strcat' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strncpy' exported twice. Previous export was in vmlinux
      WARNING: vmlinux: 'strcpy' exported twice. Previous export was in vmlinux
      Signed-off-by: default avatarMartin Habets <errandir_news@mph.eclipse.co.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb3426ad
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 9d21f09c
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000
        [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h
        [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h
        [ARM] 3504/1: Fix clcd includes for aaec2000
        [ARM] 3503/1: Fix map_desc structure for aaec2000
        [ARM] 3501/1: i.MX: fix lowlevel debug macros
        [ARM] rtc-sa1100: fix compiler warnings and error cleanup
        [ARM] Allow SA1100 RTC alarm to be configured for wakeup
      9d21f09c
  2. 07 May, 2006 7 commits
  3. 06 May, 2006 10 commits
  4. 05 May, 2006 7 commits
  5. 04 May, 2006 14 commits
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · d98550e3
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [PATCH] powerpc: Use the ibm,pa-features property if available
        powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses
        [PATCH] ppc32 CPM_UART: fixes and improvements
        [PATCH] ppc32 CPM_UART: Fixed break send on SCC
        [PATCH] powerpc/kprobes: fix singlestep out-of-line
        [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up
      d98550e3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · f9cc8475
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3490/1: i.MX: move uart resources to board files
        [ARM] 3488/1: make icedcc_putc do the right thing
        [ARM] 3487/1: IXP4xx: Support non-PCI systems
        [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros
      f9cc8475
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · 6fc56ccf
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Move set_ios debugging into mmc.c
        [MMC] Correct mmc_request_done comments
        [MMC] PXA: reduce the number of lines PXAMCI debug uses
        [MMC] PXA and i.MX: don't avoid sending stop command on error
        [MMC] extend data timeout for writes
        [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility
      6fc56ccf
    • Linus Torvalds's avatar
      Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block · cbdf811c
      Linus Torvalds authored
      * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check
        [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST
        [PATCH] splice: rename remaining info variables to pipe
        [PATCH] splice: LRU fixups
        [PATCH] splice: fix unlocking of page on error ->prepare_write()
      cbdf811c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 936ef1d4
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [DECNET]: Fix level1 router hello
        [TCP]: Fix sock_orphan dead lock
        [ROSE]: Eleminate HZ from ROSE kernel interfaces
        [NETROM]: Eleminate HZ from NET/ROM kernel interfaces
        [AX.25]: Eleminate HZ from AX.25 kernel interfaces
        [ROSE]: Fix routing table locking in rose_remove_neigh.
        [AX.25]: Move AX.25 symbol exports
        [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers.
        [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls.
        [AX.25]: Spelling fix
        [ROSE]: Remove useless prototype for rose_remove_neigh().
        [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer
        [NETFILTER]: H.323 helper: Change author's email address
        [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n
        [NETFILTER]: H.323 helper: fix use of uninitialized data
        [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len
      936ef1d4
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 0de2a93e
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Hook up vmsplice into syscall tables.
      0de2a93e
    • Linus Torvalds's avatar
      CREDITS file update (Tristan Greaves) · fed3be9b
      Linus Torvalds authored
      By request from Tristan.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      fed3be9b
    • Russell King's avatar
      [MMC] Move set_ios debugging into mmc.c · 920e70c5
      Russell King authored
      Rather than having every driver duplicate the set_ios debugging,
      provide a single version in mmc.c which can be expanded as we
      add additional functionality.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      920e70c5
    • Sascha Hauer's avatar
      [ARM] 3490/1: i.MX: move uart resources to board files · 5b802344
      Sascha Hauer authored
      Patch from Sascha Hauer
      
      This patch moves the i.MX uart resources and the gpio pin setup to the
      board files. This allows the boards to decide how many internal uarts
      are connected to the outside world and whether they use rts/cts or
      not.
      Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      5b802344
    • Russell King's avatar
      [MMC] Correct mmc_request_done comments · fe10c6ab
      Russell King authored
      mmc_request_done should be called at the end of handling a request, not
      between the data and initial command parts of the request.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      fe10c6ab
    • Jens Axboe's avatar
      [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check · 98232d50
      Jens Axboe authored
      nr_segs may not be > UIO_MAXIOV, however it may be equal to. This makes
      the behaviour identical to the real sys_vmsplice(). The other foov
      syscalls also agree that this is the way to go.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      98232d50
    • Patrick Caulfield's avatar
      [DECNET]: Fix level1 router hello · d1a64983
      Patrick Caulfield authored
      This patch fixes hello messages sent when a node is a level 1
      router. Slightly contrary to the spec (maybe) VMS ignores hello
      messages that do not name level2 routers that it also knows about.
      
      So, here we simply name all the routers that the node knows about
      rather just other level1 routers.  (I hope the patch is clearer than
      the description. sorry).
      Signed-off-by: default avatarPatrick Caulfield <patrick@tykepenguin.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1a64983
    • Herbert Xu's avatar
      [TCP]: Fix sock_orphan dead lock · 75c2d907
      Herbert Xu authored
      Calling sock_orphan inside bh_lock_sock in tcp_close can lead to dead
      locks.  For example, the inet_diag code holds sk_callback_lock without
      disabling BH.  If an inbound packet arrives during that admittedly tiny
      window, it will cause a dead lock on bh_lock_sock.  Another possible
      path would be through sock_wfree if the network device driver frees the
      tx skb in process context with BH enabled.
      
      We can fix this by moving sock_orphan out of bh_lock_sock.
      
      The tricky bit is to work out when we need to destroy the socket
      ourselves and when it has already been destroyed by someone else.
      
      By moving sock_orphan before the release_sock we can solve this
      problem.  This is because as long as we own the socket lock its
      state cannot change.
      
      So we simply record the socket state before the release_sock
      and then check the state again after we regain the socket lock.
      If the socket state has transitioned to TCP_CLOSE in the time being,
      we know that the socket has been destroyed.  Otherwise the socket is
      still ours to keep.
      
      Note that I've also moved the increment on the orphan count forward.
      This may look like a problem as we're increasing it even if the socket
      is just about to be destroyed where it'll be decreased again.  However,
      this simply enlarges a window that already exists.  This also changes
      the orphan count test by one.
      
      Considering what the orphan count is meant to do this is no big deal.
      
      This problem was discoverd by Ingo Molnar using his lock validator.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      75c2d907
    • Ralf Baechle's avatar
      [ROSE]: Eleminate HZ from ROSE kernel interfaces · 82e84249
      Ralf Baechle authored
      Convert all ROSE sysctl time values from jiffies to ms as units.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      82e84249