From: John Stultz, George Anzinger, Eric Piel

There was confusion over the definition of TICK_USEC.  TICK_USEC is
supposed to be based on USER_HZ, however a recent change caused TICK_USEC
to be based on HZ.  This broke the adjtimex() interface on systems where
USER_HZ != HZ.  This patch reverts the change to TICK_USEC, removes an
added mis-use of the value and fixes some incorrect comments that could
lead to this sort of confusion.

Also this patch resolves the related LTP adjtimex failures.

From: David Mosberger <davidm@napali.hpl.hp.com>

At the moment, if you don't set CLONE_CHILD_SETTID/CLONE_CHILD_CLEARTID,
the {set,clear}_child_tid values get inherited from the parent task.  I may
be missing something, but I suspect that's not the intended behavior.  The
patch below instead clears the respective members.

The slab debugging code is supposed to poison freshly-allocated obejcts with
0x5a and freed ones with 0x6b, so we can distinguish use-uninitialised from
use-after-free.

It wasn't working right for recycled objects.  Fix.

Use slab_error for printing the error message from kmem_cache_destroy

From: Peter Chubb <peter@chubb.wattle.id.au>

Add two new system calls, statfs64 and fstatfs64.  This has been needed
sincew the 64-bit sector_t merge - the current structures will overflow.

- Use a common interface (vfs_statfs) with the rest of the kernel,

- convert to 32-bit at (f)statfs time.

- New field f_frsize gives underlying fragment size for the filesystem.
  (Solaris has this, and the Open Group describe it).

- The old statfs syscalls will now return -EOVERFLOW if the device was
  too large to be represented inthe old data structures.

The new system calls take a size_t argument, which is the size of the
structure to be filled in (as requested by Ben LaHaise), to `futureproof' the
interface.

Has been reviewed by the arch maintainers and by Ulrich Drepper.

From: Andi Kleen <ak@suse.de>

On i386 and most other ports kern_addr_valid is hardcoded to 1.

This works fine as long as only mapped areas are accessed.  When you have
something partially mapped in the kclist it is possible that start points to
an unmapped address.  The correct behaviour in this case is to zero the user
space.  We shouldn't return -EFAULT because the fault is against the mmapped
range, not against the user's address.

copy_to_user usually even checks for exceptions on both source and
destination, but it does not zero the destination in this case and worse
results in EFAULT, which is user visible.

This patch just tries to clear_user in this case again to actually zero the
user data and catch real user side EFAULTs.

Another way to fix this is to have kern_addr_valid do a real page table
lookup (I did that on AMD64), but having this fallback is a bit more
reliable in case there is a race somewhere.

On i386 it could happen for example if the direct space to max_low_pfn
contains something unmapped.  This normally isn't the case, but e.g.  the
slab debugging patches in -mm* do this so it's better to handle it.

Drawback is that it relies on a somewhat undocumented copy_to_user behaviour
(fault on both source and destination).  It is true for i386 and amd64, but I
don't know if it is for other port.  In the worst case they just don't have
the race protection and may see bogus EFAULTs.

From: Andi Kleen <ak@suse.de>

The recent IA64 changes for /proc/kcore broke the access on i386.
Currently no notes are written for the direct mapped or vmalloced memory,
which makes gdb reject it.

This patch fixes it.  Other ports probably need to do the same changes.

If you open /dev/ram7 when the kernel is configured for 4 ramdisks, things
blow up.  Teach rd_open() to check that the minor is in range.

If someome tries to unmount the fs while kjournald is performing a commit,
kjournald forgets to look for the termination request and goes into permanent
sleep.

The memset which is performed if access_ok() fails got lost in the
copy_*_user() rework.  Put it back.

Bloats the kernel by 8k :(

Also contains a few related #includes and whitespace fixlets from
Joshua Kwan <joshk@triplehelix.org>

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

This is an update for the SiS IDE driver.

This is a 99% Vojtech work :
- Independant southbridge detection (no need to add current and future
  MuTIOL northbridge PCI ids knowledge to the driver),
- Lots of code cleanup,
- Debug code removed (unused for a while, I will maintain it in my tree
  if needed),

I changed some things:
- the new config_xfer_rate is commented out until ide_find_best_mode is
  patched for bad drive handling (until then I reverted to the old one
  using the config_drive_xfer_rate helper function).

Hi Greg.  Ivan's not happy with the solution I came up with for naming
/proc/bus/pci and Anton would prefer something slightly different too,
so I abstracted the name out so each architecture can do its own thing.

This is against 2.5.72 so won't apply cleanly to your tree (it
applies to bitkeeper as of a few minutes ago with only minor offsets).
I've implemented the original name for non-PCI-domain machines; done what
ia64 and alpha need, respectively (assuming I didn't misunderstand Ivan),
and plopped in the Old Way of doing things for Sparc64, PPC and PPC64.
Maintainers may alter this to whatever degree of complexity they wish.

into kroah.com:/home/greg/linux/BK/pci-2.5

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

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

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

While there is a separate driver for 2104x tulips (CONFIG_DE2104X),
drivers/net/tulip/Kconfig states that CONFIG_TULIP also supports
2104x tulips. This is not the case since that support was removed
in December 2001. A user with an old tulip may thus be tricked into
configuring the wrong driver. (I was, on my PMac 4400.)

The patch below removes this misinformation from tulip's Kconfig.

(pulled change from 2.4)

the second patch:
replaces busy_loop with a simple macro doing a schedule_timeout. busy_loop was never
called from interrupt conext anyway, so no need for that. and the sti() is gone.

rgds
-daniel

hi

this patch does:
- net_device is no longer allocated as part of the driver's private structure,
  instead it's allocated via alloc_netdev
- xirc2ps_detach calls xirc2ps_release if necessary (like the other drivers)

against 2.5.70-bk.

rgds
-daniel

drivers/net/pcnet32.c: In function `pcnet32_init_ring':
drivers/net/pcnet32.c:1006: warning: comparison between pointer and integer

According to a report the my_inet_aton code in bond_main.c is copied
from 4.4BSD, but it doesn't carry a BSD copyright license. In addition
it is somewhat redundant with the standard in_aton.  Convert it
to use the linux function.

Error handling is a bit worse than before, but not much.

Patch for 2.5 bonding. The 2.4 version has the same problem, but afaik
it is scheduled to be replaced by the 2.5 codebase anyways.

-Andi

1) Use unsigned long for types holding jiffies.
2) Use size_t for read/write buffer lengths.
3) Use proper printf format string for size_t.

into groveronline.com:/root/bk/linux-acpi

- Fix To/FromBCD, eliminating the need for an arch-specific #define
- Do not acquire a semaphore in the S5 shutdown path
- Fix ex_digits_needed for 0 (Takayoshi Kochi)
- Fix sleep/stall code reversal (Andi Kleen)
- Revert a change having to do with control method calling semantics

1) Use proper size_t printf format specifier
2) Cast pointers properly when passing them to hashfind
3) Print pointers using proper printf format specifier
   instead of using ugly casts.