1. 28 4月, 2006 9 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 2cb14596
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        [PATCH] Added URI of "linux kernel development process"
        [PATCH] Kobject: possible cleanups
        [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled
        [PATCH] Kobject: fix build error
        [PATCH] Frame buffer: remove cmap sysfs interface
      2cb14596
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · a9aa0e24
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Fix branch emulation for floating-point exceptions.
        [MIPS] Cleanup inode->r_dev usage.
        [MIPS] Update MIPS defconfigs.
        [MIPS] Get rid of CONFIG_ADVANCED.
        [MIPS] Kconfig: Clarify description of CROSSCOMPILE.
        [MIPS] 24K LV: Add core card id.
        [MIPS] Sparse: fix sparse for 64-bit kernels.
        [MIPS] Use __ffs() instead of ffs() in ip32_irq0().
        [MIPS] Fix bitops for MIPS32/MIPS64 CPUs.
        [MIPS] Fix ip27 build.
        [MIPS] Oprofile: fix sparse warning.
        [MIPS] Fix oprofile module unloading
      a9aa0e24
    • L
      Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block · 7c1c3eb8
      Linus Torvalds 提交于
      * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] splice: make the read-side do batched page lookups
        [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages()
        [PATCH] splice: switch to using page_cache_readahead()
      7c1c3eb8
    • P
    • A
      [PATCH] Kobject: possible cleanups · 5b3ef14e
      Adrian Bunk 提交于
      This patch contains the following possible cleanups:
      - #if 0 the following unused global function:
        - subsys_remove_file()
      - remove the following unused EXPORT_SYMBOL's:
        - kset_find_obj
        - subsystem_init
      - remove the following unused EXPORT_SYMBOL_GPL:
        - kobject_add_dir
      Signed-off-by: NAdrian Bunk <bunk@stusta.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      5b3ef14e
    • J
      [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled · bde11d79
      Jean Delvare 提交于
      Fix the following warning which happens when OCFS2_FS is enabled but
      DEBUG_FS isn't:
      
      fs/ocfs2/dlmglue.c: In function `ocfs2_dlm_init_debug':
      fs/ocfs2/dlmglue.c:2036: warning: passing arg 5 of `debugfs_create_file' discards qualifiers from pointer target type
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Cc: Arjan van de Ven <arjan@infradead.org>
      Cc: Joel Becker <Joel.Becker@oracle.com>
      Acked-by: NMark Fasheh <mark.fasheh@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      bde11d79
    • K
      [PATCH] Kobject: fix build error · 4d17ffda
      Kay Sievers 提交于
      This fixes a build error for various odd combinations of CONFIG_HOTPLUG
      and CONFIG_NET.
      Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
      Cc: Nigel Cunningham <ncunningham@cyclades.com>
      Cc: Andrew Morton <akpm@osdl.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4d17ffda
    • J
      [PATCH] Frame buffer: remove cmap sysfs interface · 913e7ec5
      Jon Smirl 提交于
      Remove it as it does not work properly due to sysfs core changes.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      913e7ec5
    • Z
      [PATCH] x86/PAE: Fix pte_clear for the >4GB RAM case · 6e5882cf
      Zachary Amsden 提交于
      Proposed fix for ptep_get_and_clear_full PAE bug.  Pte_clear had the same bug,
      so use the same fix for both.  Turns out pmd_clear had it as well, but pgds
      are not affected.
      
      The problem is rather intricate.  Page table entries in PAE mode are 64-bits
      wide, but the only atomic 8-byte write operation available in 32-bit mode is
      cmpxchg8b, which is expensive (at least on P4), and thus avoided.  But it can
      happen that the processor may prefetch entries into the TLB in the middle of an
      operation which clears a page table entry.  So one must always clear the P-bit
      in the low word of the page table entry first when clearing it.
      
      Since the sequence *ptep = __pte(0) leaves the order of the write dependent on
      the compiler, it must be coded explicitly as a clear of the low word followed
      by a clear of the high word.  Further, there must be a write memory barrier
      here to enforce proper ordering by the compiler (and, in the future, by the
      processor as well).
      
      On > 4GB memory machines, the implementation of pte_clear for PAE was clearly
      deficient, as it could leave virtual mappings of physical memory above 4GB
      aliased to memory below 4GB in the TLB.  The implementation of
      ptep_get_and_clear_full has a similar bug, although not nearly as likely to
      occur, since the mappings being cleared are in the process of being destroyed,
      and should never be dereferenced again.
      
      But, as luck would have it, it is possible to trigger bugs even without ever
      dereferencing these bogus TLB mappings, even if the clear is followed fairly
      soon after with a TLB flush or invalidation.  The problem is that memory above
      4GB may now be aliased into the first 4GB of memory, and in fact, may hit a
      region of memory with non-memory semantics.  These regions include AGP and PCI
      space.  As such, these memory regions are not cached by the processor.  This
      introduces the bug.
      
      The processor can speculate memory operations, including memory writes, as long
      as they are committed with the proper ordering.  Speculating a memory write to
      a linear address that has a bogus TLB mapping is possible.  Normally, the
      speculation is harmless.  But for cached memory, it does leave the falsely
      speculated cacheline unmodified, but in a dirty state.  This cache line will be
      eventually written back.  If this cacheline happens to intersect a region of
      memory that is not protected by the cache coherency protocol, it can corrupt
      data in I/O memory, which is generally a very bad thing to do, and can cause
      total system failure or just plain undefined behavior.
      
      These bugs are extremely unlikely, but the severity is of such magnitude, and
      the fix so simple that I think fixing them immediately is justified.  Also,
      they are nearly impossible to debug.
      Signed-off-by: NZachary Amsden <zach@vmware.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      6e5882cf
  2. 27 4月, 2006 19 次提交
  3. 26 4月, 2006 12 次提交