1. 21 Mar, 2006 27 commits
  2. 20 Mar, 2006 13 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · c4a1745a
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (230 commits)
        [SPARC64]: Update defconfig.
        [SPARC64]: Fix 2 bugs in huge page support.
        [SPARC64]: CONFIG_BLK_DEV_RAM fix
        [SPARC64]: Optimized TSB table initialization.
        [SPARC64]: Allow CONFIG_MEMORY_HOTPLUG to build.
        [SPARC64]: Use SLAB caches for TSB tables.
        [SPARC64]: Don't kill the page allocator when growing a TSB.
        [SPARC64]: Randomize mm->mmap_base when PF_RANDOMIZE is set.
        [SPARC64]: Increase top of 32-bit process stack.
        [SPARC64]: Top-down address space allocation for 32-bit tasks.
        [SPARC64] bbc_i2c: Fix cpu check and add missing module license.
        [SPARC64]: Fix and re-enable dynamic TSB sizing.
        [SUNSU]: Fix missing spinlock initialization.
        [TG3]: Do not try to access NIC_SRAM_DATA_SIG on Sun parts.
        [SPARC64]: First cut at VIS simulator for Niagara.
        [SPARC64]: Fix system type in /proc/cpuinfo and remove bogus OBP check.
        [SPARC64]: Add SMT scheduling support for Niagara.
        [SPARC64]: Fix 32-bit truncation which broke sparsemem.
        [SPARC64]: Move over to sparsemem.
        [SPARC64]: Fix new context version SMP handling.
        ...
      c4a1745a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 · 88dcb911
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
        JFS: add uid, gid, and umask mount options
        JFS: Take logsync lock before testing mp->lsn
        JFS: kzalloc conversion
        JFS: Add missing file from fa3241d2
        JFS: Use the kthread_ API
        JFS: Fix regression.  fsck complains if symlinks do not have INLINEEA attribute
        JFS: ext2 inode attributes for jfs
        JFS: semaphore to mutex conversion.
        JFS: make buddy table static
        JFS: Add back directory i_size calculations for legacy partitions
      88dcb911
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · c7cace64
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (150 commits)
        [PATCH] ipw2100: Update version ipw2100 stamp to 1.2.2
        [PATCH] ipw2100: move mutex.h include from ipw2100.c to ipw2100.h
        [PATCH] ipw2100: semaphore to mutexes conversion
        [PATCH] ipw2100: Fix radiotap code gcc warning
        [PATCH] ipw2100: add radiotap headers to packtes captured in monitor mode
        [PATCH] ipw2x00: expend Copyright to 2006
        [PATCH] drivers/net/wireless/ipw2200.c: fix an array overun
        [PATCH] ieee80211: Don't update network statistics from off-channel packets.
        [PATCH] ipw2200: Update ipw2200 version stamp to 1.1.1
        [PATCH] ipw2200: switch to the new ipw2200-fw-3.0 image format
        [PATCH] ipw2200: wireless extension sensitivity threshold support
        [PATCH] ipw2200: Enables the "slow diversity" algorithm
        [PATCH] ipw2200: Set a meaningful silence threshold value
        [PATCH] ipw2200: export `debug' module param only if CONFIG_IPW2200_DEBUG
        [PATCH] ipw2200: Change debug level for firmware error logging
        [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode
        [PATCH] ipw2200: Fix ipw_sw_reset() implementation inconsistent with comment
        [PATCH] ipw2200: Fix rf_kill is activated after mode change with 'disable=1'
        [PATCH] ipw2200: remove the WPA card associates to non-WPA AP checking
        [PATCH] ipw2200: Add signal level to iwlist scan output
        ...
      c7cace64
    • Linus Torvalds's avatar
      Merge branch 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block · a90779bf
      Linus Torvalds authored
      * 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block:
        [PATCH] fix rmmod problems with elevator attributes, clean them up
        [PATCH] elevator_t lifetime rules and sysfs fixes
        [PATCH] noise removal: cfq-iosched.c
        [PATCH] don't bother with refcounting for cfq_data
        [PATCH] fix sysfs interaction and lifetime rules handling for queues
        [PATCH] regularize blk_cleanup_queue() use
        [PATCH] fix cfq_get_queue()/ioprio_set(2) races
        [PATCH] deal with rmmod/put_io_context() races
        [PATCH] stop elv_unregister() from rogering other iosched's data, fix locking
        [PATCH] stop cfq from pinning queue down
        [PATCH] make cfq_exit_queue() prune the cfq_io_context for that queue
        [PATCH] fix the exclusion for ioprio_set()
        [PATCH] keep sync and async cfq_queue separate
        [PATCH] switch to use of ->key to get cfq_data by cfq_io_context
        [PATCH] stop leaking cfq_data in cfq_set_request()
        [PATCH] fix cfq hash lookups
        [PATCH] fix locking in queue_requests_store()
        [PATCH] fix double-free in blk_init_queue_node()
        [PATCH] don't do exit_io_context() until we know we won't be doing any IO
      a90779bf
    • Jeff Garzik's avatar
    • Jeff Garzik's avatar
      Merge branch 'master' · d378aca6
      Jeff Garzik authored
      d378aca6
    • David S. Miller's avatar
      [SPARC64]: Update defconfig. · ac0eb3eb
      David S. Miller authored
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac0eb3eb
    • David S. Miller's avatar
      [SPARC64]: Fix 2 bugs in huge page support. · f6b83f07
      David S. Miller authored
      1) huge_pte_offset() did not check the page table hierarchy
         elements as being empty correctly, resulting in an OOPS
      
      2) Need platform specific hugetlb_get_unmapped_area() to handle
         the top-down vs. bottom-up address space allocation strategies.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f6b83f07
    • Andrew Morton's avatar
      [SPARC64]: CONFIG_BLK_DEV_RAM fix · 467418f3
      Andrew Morton authored
      init/do_mounts_rd.c depends upon CONFIG_BLK_DEV_RAM, not CONFIG_BLK_DEV_INITRD.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      467418f3
    • David S. Miller's avatar
      [SPARC64]: Optimized TSB table initialization. · bb8646d8
      David S. Miller authored
      We only need to write an invalid tag every 16 bytes,
      so taking advantage of this can save many instructions
      compared to the simple memset() call we make now.
      
      A prefetching implementation is implemented for sun4u
      and a block-init store version if implemented for Niagara.
      
      The next trick is to be able to perform an init and
      a copy_tsb() in parallel when growing a TSB table.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb8646d8
    • David S. Miller's avatar
      [SPARC64]: Allow CONFIG_MEMORY_HOTPLUG to build. · 88d70794
      David S. Miller authored
      online_page() is straightforward, and then add a dummy
      remove_memory() that returns -EINVAL just like i386.
      
      There is no point in implementing remove_memory() since
      __remove_pages() has no implementation either.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      88d70794
    • David S. Miller's avatar
      9b4006dc
    • David S. Miller's avatar
      [SPARC64]: Don't kill the page allocator when growing a TSB. · b52439c2
      David S. Miller authored
      Try only lightly on > 1 order allocations.
      
      If a grow fails, we are under memory pressure, so do not try
      to grow the TSB for this address space any more.
      
      If a > 0 order TSB allocation fails on a new fork, retry using
      a 0 order allocation.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b52439c2