From: john stultz <johnstul@us.ibm.com>

This patch allows one to manually specify the i386 gettimeofday time-source
by passing clock=[pit|tsc|cyclone|...] as a boot argument.  The argument will
override the default probled selection, and in case the selected time-source
not be avalible the code defaults to using the PIT (printing a warning saying
so).

It is generally illegal to wait on an unpinned buffer - another CPU could
free it up even before __wait_on_buffer() has taken a ref against the buffer.

Maybe external locking rules will prevent this in specific cases, but that is
really subtle and fragile as locking rules are evolved.

The patch detects people calling wait_on_buffer() against an unpinned buffer
and issues a diagnostic.

Also remove the get_bh() from __wait_on_buffer().  It is too late.

ext3 is only permitting files of up to 32G.  It should be allowing files to
be up to 2TB.

This is because it is running ext3_max_size(1024) before the filesystem's
blocksize has been determined.

From: Hugh Dickins <hugh@veritas.com>

Stop vm_enough_memory double counting total_swapcache_pages: it dates
from the days when we didn't free swap when freeing swapcache page.

From: Hugh Dickins <hugh@veritas.com>

move_from_swap_cache and add_to_page_cache_lru are using GFP_ATOMIC,
which can easily fail in an intermittent way.  Rude if shmem_getpage
then fails with -ENOMEM: use blk_congestion_wait() to let kswapd in,
and repeat.

From: Hugh Dickins <hugh@veritas.com>

Recent testing has shown that swapoff can sneak a page back into the
tmpfs page cache after truncate_inode_pages has cleaned it, before
shmem_truncate resets next_index to stop that: BUG_ON(inode->i_blocks)
in shmem_delete_inode.  So call truncate_inode_pages again to be safe.

From: Hugh Dickins <hugh@veritas.com>

Make add_to_swap_cache static, it's only used by read_swap_cache_async;
and since that has just done a GFP_HIGHUSER allocation, surely it's
better for add_to_swap_cache to use GFP_KERNEL than GFP_ATOMIC.

From: Hugh Dickins <hugh@veritas.com>

Raised #endif CONFIG_SWAP in shrink_list, it was excluding
try_to_unmap of file pages.  Suspect !CONFIG_MMU relied on
that to suppress try_to_unmap, added SWAP_FAIL stub for it.

From: Hugh Dickins <hugh@veritas.com>

Delete unused SWAP_ERROR and non-existent page_over_rsslimit().

From: george anzinger <george@mvista.com>

Timer expirations are being reported twice.

install_page() needs to run flush_cache_page() prior to overwriting an
already-established pte.

From: Manfred Spraul <manfred@colorfullife.com>

Brian spotted a stupid bug in the slab initialization:

If multiple objects fit into one cacheline, then the allocator ignores
SLAB_HWCACHE_ALIGN and squeezes the objects into the same cacheline.  The
implementation contains an off by one error and thus doesn't work correctly:
For Athlon optimized kernels, the 32-byte slab uses 64 byte of memory.

From: Eric Piel <Eric.Piel@Bull.Net>

Fixes some long/int confusion on 64-bit machines which was causing failures
on ia64 - we end up trying to set bits in the 32-63 range on an int and the
kernel locks up.

Also cleans up idr.h.

George has acked this change.

The patch is designed to help locate where the kernel is dying during the
startup sequence.

- Boot parameter "initcall_debug" causes the kernel to print out the
  address of each initcall before calling it.

  The kallsyms tables do not cover __init sections, so printing the
  symbolic version of these symbols doesn't work.  They need to be looked up
  in System.map.

- Detect whether an initcall returns with interrupts disabled or with a
  locking imbalance.  If it does, complain and then try to fix it up.

into home.transmeta.com:/home/torvalds/v2.5/linux

Don't allow "bind_request" to be called before "register_pccard_driver".

into home.transmeta.com:/home/torvalds/v2.5/linux

This fixes ipmi compilation (with some documentation updates and another
minor fix, too).

It also fixes a problem with the state machine getting stuck in a
certain error condition.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into samba.org:/home/paulus/kernel/for-linus-ppc

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

we're writing over TCP and have done a partial send.

  The following patch by Joe Korty removes an over-zealous check in the NFS
  read code that causes pages to be incorrectly marked with PG_error and
  hence causes an EIO to be returned to userland.

  The test is incorrect as it ignores the fact that we may be caching a
  write that will extend the file on the server (and hence will create a
  hole in the region concerned.).

a null 'p_proc' procedure pointer.

and drop the 'flags' argument (it was always set too LOOKUP_PARENT).

If the user supplies and empty path, return -ENOENT.

Doing this ensures that we keep probing the connection to the server
rather than just waiting for the entire congestion window to time out.
The latter can be very expensive due to the exponential backoff rule.

Thanks to  Angus Sawyer <angus.sawyer@dsl.pipex.com> and
   Daniel McNeil <daniel@osdl.org>

Also reformat some printks so lines don't exceed 80chars.

Thanks to  Angus Sawyer <angus.sawyer@dsl.pipex.com>

From: Daniel McNeil <daniel@osdl.org>

This fixes an oops caused by incorrect usage of sector_div()
in which_dev() in md/linear.c.  It was dereferencing an non-existent
hash table entry.