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

This renames the bad "timer" variable to "cur_timer" and moves externs to
.h files.

From: Daniel Jacobowitz <dan@debian.org>

Right now, CLONE_DETACHED threads silently vanish from GDB's sight when
they exit.  This patch lets the thread report its exit to the debugger, and
then be auto-reaped as soon as it is collected, instead of being reaped as
soon as it exits and not reported at all.

GDB works either way, but this is more correct and will be useful for some
later GDB patches.

From: Adrian Bunk <bunk@fs.tum.de>

I got an error at the final linking with CONFIG_TC35815 enabled since
the variables tc_readl and tc_writel are not available.

The only place where they are defined is arch/mips/pci/ops-jmr3927.c.

Replace it with the blockdev inode's i_sem.  And we only really need that for
atomic access to file->f_pos.

Rework the file_ops.flush() API sothat it is no longer called under
lock_kernel().  Push lock_kernel() down to all impementations except CIFS,
which doesn't want it.

From: William Lee Irwin III <wli@holomorphy.com>

Remove spurious BKL acquisitions in /proc/.  The BKL is not required to
access nr_threads for reporting, and get_locks_status() takes it
internally, wrapping all operations with it.

lock_kernel() need not be held across truncate.

`attr' is on the stack, and the inode's contents can change as soon as we
return from inode_change_ok() anyway.  I can't see anything which is actually
being locked in there.

Teach ramfs to use generic_file_llseek: default_llseek takes lock_kernel().

From: Dave Hansen <haveblue@us.ibm.com>

The current numa meminfo code exports (via sysfs) pgdat->node_size, as
totalram.  This variable is consistently used elsewhere to mean "the number
of physical pages that this particular node spans".  This is _not_ what we
want to see from meminfo, which is: "how much actual memory does this node
have?"

The following patch removes pgdat->node_size, and replaces it with
->node_spanned_pages.  This is to avoid confusion with a new variable,
node_present_pages, which is the _actual_ value that we want to export in
meminfo.  Most of the patch is a simple s/node_size/node_spanned_pages/.
The node_size() macro is also removed, and replaced with new ones for
node_{spanned,present}_pages() to avoid confusion.

We were bitten by this problem in this bug:
	http://bugme.osdl.org/show_bug.cgi?id=818

Compiled and tested on NUMA-Q.

From: Manfred Spraul <manfred@colorfullife.com>

Manfred's latest page unmapping debug patch.

The patch adds support for a special debug mode to both the page and the slab
allocator: Unused pages are removed from the kernel linear mapping.  This
means that now any access to freed memory will cause an immediate exception.
Right now, read accesses remain totally unnoticed and write accesses may be
catched by the slab poisoning, but usually far too late for a meaningfull bug
report.

The implementation is based on a new arch dependant function,
kernel_map_pages(), that removes the pages from the linear mapping.  It's
right now only implemented for i386.

Changelog:

- Add kernel_map_pages() for i386, based on change_page_attr.  If
  DEBUG_PAGEALLOC is not set, then the function is an empty stub.  The stub
  is in <linux/mm.h>, i.e.  it exists for all archs.

- Make change_page_attr irq safe.  Note that it's not fully irq safe due to
  the lack of the tlb flush ipi, but it's good enough for kernel_map_pages().
   Another problem is that kernel_map_pages is not permitted to fail, thus
  PSE is disabled if DEBUG_PAGEALLOC is enabled

- use kernel_map pages for the page allocator.

- use kernel_map_pages for the slab allocator.

  I couldn't resist and added additional debugging support into mm/slab.c:

  * at kfree time, the complete backtrace of the kfree caller is stored
    in the freed object.

  * a ptrinfo() function that dumps all known data about a kernel virtual
    address: the pte value, if it belongs to a slab cache the cache name and
    additional info.

  * merging of common code: new helper function obj_dbglen and obj_dbghdr
    for the conversion between the user visible object pointers/len and the
    actual, internal addresses and len values.

From: Hugh Dickins <hugh@veritas.com>

mremap's move_vma VM_LOCKED case was still wrong.

If the do_munmap unmaps a part of new_vma, then its vm_start and vm_end
from before cannot both be the right addresses for the make_pages_present
range, and may BUG() there.

We need [new_addr, new_addr+new_len) to be locked down; but
move_page_tables already transferred the locked pages [new_addr,
new_addr+old_len), and they're either held in a VM_LOCKED vma throughout,
or temporarily in no vma: in neither case can be swapped out, so no need to
run over that range again.

With the recent fixes, io_schedule needs to be exported for modular dm
to work.

Replace a couple of bogus yields() with schedule() and io_schedule()
respectively.

This includes the remainder of arch-specific part of the SH merge.
This patch only effects arch/sh and include/asm-sh, against current BK.

Okay, since now corruption happens and there are some other issues to be
resolved ("bad: scheduling while atomic" and "/proc/ide/hdX/identify")
better set it by default to n for 2.5.74, also mark it EXPERIMENTAL.

AMD64 does not support a.out, so don't display it in the configuration.

AMD64 like IA64 needs to force IPC_64 in the IPC functions. This makes
2.5 compatible with 2.4 again.

Since KALLSYMS is defined, might aswell use it somewhere.

Spelling fix

The qeth network device driver. Supports the OSA Express Gigabit cards,
HiperSockes and VM GuestLAN interfaces.

Add thin interrupt support to qdio.

Add configuration option to select the different processor types. Add new
path group algorith and new relocation types introduces with z990.

Fix online attribute. "echo 1 > online" should enable a device and
"echo 0 > online" should disable a device, not the other way round.

Fix ptrace system call number replacement code.

Fix SEMTIMEDOP operation in sys_ipc. Patch by Ernie Petrides.

into home.osdl.org:/home/torvalds/v2.5/linux

(can be enabled by ethtool)

into home.osdl.org:/home/torvalds/v2.5/linux

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

This patch for 2.5 copies into unusual_devs.h an entry that is present in
2.4 but missing here.  It also adds back the IGNORE_SER flag with a dummy
value, just for backward compatibility.

dev->udev was set to NULL to indicate a device disconnect but we need
this value for usb_buffer_free() when device is still opened and cleanup is
delayed until skel_release().
I've added a dev->present for preventing device read, write and ioctl.
Also URB_NO_DMA_MAP is changed to URB_NO_TRANSFER_DMA_MAP and a unused
var is removed.

This creates sys/class/usb_host/ which lists all usb hosts in the system.

- Update defconfig
- Merge with i386
- Make oprofile compile again
- Warning fixes
- Minor changes for 32bit SYSCALL path (still disabled)
- Remove obsolete FS/GS symbols in ptrace.h

into home.osdl.org:/home/torvalds/v2.5/linux

From: Pascal Schmidt <der.eremit@email.de>

Add capability flag for MO drives. Since ATAPI MOs are now recognized
by the ide-cd driver, it is useful to have a capability flag to be able
to tell MO drives from other drives (needed for later write support).