1. 03 4月, 2006 9 次提交
  2. 02 4月, 2006 13 次提交
  3. 01 4月, 2006 18 次提交
    • P
      [ARM] 3436/1: 2.6.16-git18: collie_defconfig broken · 50c37e21
      Pavel Machek 提交于
      Patch from Pavel Machek
      
      > The kautobuild found the following error while trying to build 2.6.16-git18
      > using collie_defconfig:
      >
      > arch/arm/mach-sa1100/collie.c:92: error: 'collie_uart_set_mctrl' undeclared here (not in a function)
      > arch/arm/mach-sa1100/collie.c:93: error: 'collie_uart_get_mctrl' undeclared here (not in a function)
      > make[1]: *** [arch/arm/mach-sa1100/collie.o] Error 1
      > make: *** [arch/arm/mach-sa1100] Error 2
      > make: Leaving directory `/var/tmp/kernel-orig'
      
      This fixes above compile error by adding missing pieces of uart
      support, and fixes compilation.
      Signed-off-by: NPavel Machek <pavel@suse.cz>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      50c37e21
    • K
      [ARM] 3437/1: Kill duplicate exports of string library functions · 344b215b
      Komal Shah 提交于
      Patch from Komal Shah
      
      This patch fixes the duplicate exports of string library functions.
      Signed-off-by: NKomal Shah <komal_shah802003@yahoo.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      344b215b
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · 683aa401
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled
      683aa401
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · 500156a0
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected
        [MMC] Add OMAP MMC host driver
      500156a0
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 5b67e8dd
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
        [ARM] 3434/1: pxa i2s amsl define
        [ARM] 3425/1: xsc3: need to include pgtable-hwdef.h
        [ARM] Allow un-muxed syscalls to be available for everyone
        [ARM] 3420/1: Missing clobber in example code
        [ARM] nommu: fixups for the exception vectors
        [ARM] nommu: add nommu specific Kconfig and MMUEXT variable in Makefile
        [ARM] nommu: start-up code
        [ARM] nommu: MPU support in boot/compressed/head.S
      5b67e8dd
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · a8b59e79
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Avoid "u64 foo : 32;" for gcc3 vs. gcc4 compatibility
        [IA64] Export cpu cache info by sysfs
      a8b59e79
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 547a77ae
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix typo in earlier cifs_unlink change and protect one
        [CIFS] Incorrect signature sent on SMB Read
        [CIFS] Fix unlink oops when indirectly called in rename error path
        [CIFS] Fix two remaining coverity scan tool warnings.
        [CIFS] Set correct lock type on new posix unlock call
        [CIFS] Upate cifs change log
        [CIFS] Fix slow oplock break response when mounts to different
        [CIFS] Workaround various server bugs found in testing at connectathon
        [CIFS] Allow fallback for setting file size to Procom SMB server when
        [CIFS] Make POSIX CIFS Extensions SetFSInfo match exactly what we want
        [CIFS] Move noisy debug message (triggerred by some older servers) from
        [CIFS] Use correct pid on new cifs posix byte range lock call
        [CIFS] Add posix (advisory) byte range locking support to cifs client
        [CIFS] CIFS readdir perf optimizations part 1
        [CIFS] Free small buffers earlier so we exceed the cifs
        [CIFS] Fix large (ie over 64K for MaxCIFSBufSize) buffer case for wrapping
        [CIFS] Convert remaining places in fs/cifs from
        [CIFS] SessionSetup cleanup part 2
        [CIFS] fix compile error (typo) and warning in cifssmb.c
        [CIFS] Cleanup NTLMSSP session setup handling
      547a77ae
    • S
      [CIFS] Fix typo in earlier cifs_unlink change and protect one · 06bcfedd
      Steve French 提交于
      extra path.
      
      Since cifs_unlink can also be called from rename path and there
      was one report of oops am making the extra check for null inode.
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      06bcfedd
    • S
      [CIFS] Incorrect signature sent on SMB Read · e9917a00
      Steve French 提交于
      Fixes Samba bug 3621 and kernel.org bug 6147
      
      For servers which require SMB/CIFS packet signing, we were sending the
      wrong signature (all zeros) on SMB Read request.  The new cifs routine
      to do signatures across an iovec was not complete - and SMB Read, unlike
      the new SMBWrite2, did not fall back to the older routine (ie use
      SendReceive vs. the more efficient SendReceive2 ie used the older
      cifs_sign_smb vs. the disabled  cifs_sign_smb2) for calculating signatures.
      
      This finishes up cifs_sign_smb2/cifs_calc_signature2 so that the callers
      of SendReceive2 can get SMB/CIFS packet signatures.
      
      Now that cifs_sign_smb2 is supported, we could start using it in
      the write path but this smaller fix does not include the change
      to use SMBWrite2 when signatures are required (which when enabled
      will make more Writes more efficient and alloc less memory).
      Currently Write2 is only used when signatures are not
      required at the moment but after more testing we will enable
      that as well).
      
      Thanks to James Slepicka and Sam Flory for initial investigation.
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      e9917a00
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 4b75679f
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Allow skb headroom to be overridden
        [TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
        [NET]: add SO_RCVBUF comment
        [NET]: Deinline some larger functions from netdevice.h
        [DCCP]: Use NULL for pointers, comfort sparse.
        [DECNET]: Fix refcount
      4b75679f
    • J
      [PATCH] avoid unaligned access when accessing poll stack · 30c14e40
      Jes Sorensen 提交于
      Commit 70674f95:
      
        [PATCH] Optimize select/poll by putting small data sets on the stack
      
      resulted in the poll stack being 4-byte aligned on 64-bit architectures,
      causing misaligned accesses to elements in the array.
      
      This patch fixes it by declaring the stack in terms of 'long' instead
      of 'char'.
      
      Force alignment of poll and select stacks to long to avoid unaligned
      access on 64 bit architectures.
      Signed-off-by: NJes Sorensen <jes@sgi.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      30c14e40
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · d21c356b
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] libata: fix ata_xfer_tbl termination
        [PATCH] libata: make ata_qc_issue complete failed qcs
        [PATCH] libata: fix ata_qc_issue failure path
        [PATCH] ata_piix: fix ich6/m_map_db
        [libata] ahci: add ATI SB600 PCI IDs
      d21c356b
    • D
      [PATCH] Document Linux's memory barriers [try #7] · 108b42b4
      David Howells 提交于
      The attached patch documents the Linux kernel's memory barriers.
      
      I've updated it from the comments I've been given.
      
      The per-arch notes sections are gone because it's clear that there are so many
      exceptions, that it's not worth having them.
      
      I've added a list of references to other documents.
      
      I've tried to get rid of the concept of memory accesses appearing on the bus;
      what matters is apparent behaviour with respect to other observers in the
      system.
      
      Interrupts barrier effects are now considered to be non-existent. They may be
      there, but you may not rely on them.
      
      I've added a couple of definition sections at the top of the document: one to
      specify the minimum execution model that may be assumed, the other to specify
      what this document refers to by the term "memory".
      
      I've made greater mention of the use of mmiowb().
      
      I've adjusted the way in which caches are described, and described the fun
      that can be had with cache coherence maintenance being unordered and data
      dependency not being necessarily implicit.
      
      I've described (smp_)read_barrier_depends().
      
      I've rearranged the order of the sections, so that memory barriers are
      discussed in abstract first, and then described the memory barrier facilities
      available on Linux, before going on to more real-world discussions and examples.
      
      I've added information about the lack of memory barriering effects with atomic
      ops and bitops.
      
      I've added information about control dependencies.
      
      I've added more diagrams to illustrate caching interactions between CPUs.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      108b42b4
    • K
      [PATCH] wrong error path in dup_fd() leading to oopses in RCU · 42862298
      Kirill Korotaev 提交于
      Wrong error path in dup_fd() - it should return NULL on error,
      not an address of already freed memory :/
      
      Triggered by OpenVZ stress test suite.
      
      What is interesting is that it was causing different oopses in RCU like
      below:
      Call Trace:
         [<c013492c>] rcu_do_batch+0x2c/0x80
         [<c0134bdd>] rcu_process_callbacks+0x3d/0x70
         [<c0126cf3>] tasklet_action+0x73/0xe0
         [<c01269aa>] __do_softirq+0x10a/0x130
         [<c01058ff>] do_softirq+0x4f/0x60
         =======================
         [<c0113817>] smp_apic_timer_interrupt+0x77/0x110
         [<c0103b54>] apic_timer_interrupt+0x1c/0x24
        Code:  Bad EIP value.
         <0>Kernel panic - not syncing: Fatal exception in interrupt
      Signed-Off-By: NPavel Emelianov <xemul@sw.ru>
      Signed-Off-By: NDmitry Mishin <dim@openvz.org>
      Signed-Off-By: NKirill Korotaev <dev@openvz.org>
      Signed-Off-By: NLinus Torvalds <torvalds@osdl.org>
      42862298
    • N
      [PATCH] mutex: some cleanups · e358c1a2
      Nicolas Pitre 提交于
      Turn some macros into inline functions and add proper type checking as
      well as being more readable.  Also a minor comment adjustment.
      Signed-off-by: NNicolas Pitre <nico@cam.org>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      e358c1a2
    • J
      [PATCH] Decrease number of pointer derefs in jsm_tty.c · a58e00e7
      Jesper Juhl 提交于
      Decrease the number of pointer derefs in drivers/serial/jsm/jsm_tty.c
      
      Benefits of the patch:
       - Fewer pointer dereferences should make the code slightly faster.
       - Size of generated code is smaller
       - Improved readability
      Signed-off-by: NJesper Juhl <jesper.juhl@gmail.com>
      Acked-by: N"V. ANANDA KRISHNAN" <mansarov@us.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      a58e00e7
    • A
      [PATCH] fs/namei.c: make lookup_hash() static · a244e169
      Adrian Bunk 提交于
      As announced, lookup_hash() can now become static.
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      a244e169
    • A
      [PATCH] unexport get_wchan · 0cb3463f
      Adrian Bunk 提交于
      The only user of get_wchan is the proc fs - and proc can't be built modular.
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      0cb3463f