- removes 2.4 specific macros/inline functions
         - fix rum vs. rsm bug for psr.up
         - introduce cleaner PMC_IS_CONTROL() macro
         - only save the value of psr.up on ctxsw (not whole psr)"

	when bspstore happened to point to an RNaT-slot.
	Bug reported by Matt Chapman.

Here's a patch against your bk tree that keeps things building for sn2
(and working with the discontig patch applied).

  Add back IDE configuration.

	this also ensure we really do test the linker which will be
	used when building the gate DSO.

I _think_ I got this one right (at least, it booted on hw).  It should
allow generic kernels to include the sn2 code.

Updates the PCI routines for sn2.

Small fix for hwgfs on sn2.

Small patch to fixup the new mark_idle() stuff for sn2.

I think there are other 64p issues in other places, but we found this
one while doing 2.5 bringup on hardware.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-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

	Since these branches use a special calling-convention, we don't
	want to go through the PLT stubs normally used for cross-module
	calls.  Also fix a 1-bit bug in the plt_reloc() function which
	got triggered now that the core code lives below the module
	code (due to the virtual mapping of the core).

This is an old problem, first reported in December 2001. 
The test case is a multithreaded application doing a large number of 
malloc()/free().

When running on a 16k page size kernel, the current algorithm creates
a temporary page, copies data to that page, does a new mmap and copies
back subpages from the temporary page. This leaves a window of opportunity
open for another thread to unmap or change the data in such a way that
the new page has stale data.

A patch was proposed which tries to do away with copying if the old page
was writable.  The patch was rejected because it could corrupt data in
the MAP_SHARED case.

https://external-lists.vasoftware.com/archives/linux-ia64/2001-December/002549.html
https://external-lists.vasoftware.com/archives/linux-ia64/2001-December/002550.html

Since we found that most of the apps which ran into this problem were
dealing with pages where the old data and new data are both anonymous,
I reworked the above patch in such a way that we don't optimize for
the MAP_SHARED case. Infact, the only case that we optimize is the case
where the old and new mapping are both anonymous.

Propagate do_settimeofday() change into osf_settimeofday().

Ivan.

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

- 2.4 resync
  - incorrect size usage in pci_unmap_single();
  - s/ETH_P_IP/hdlc_type_trans()/
- inccorect debug message in dscc4_clock_setting();
- split of TO_STATE() into TO_STATE_{RX/TX} for documentation purpose.

into kernel.bkbits.net:/home/davem/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Lots of small fixes and I merged the PCI subsystem with i386 again
because it was mostly identical. This makes the patch quite big,
but it only removes files.

 - Merge PCI subsystem with i386.

   This changes the initialization order of PCI and IOMMU slightly.  It
   didn't see any problems yet, but it could cause some in theory.  It
   re-adds some code that used to be removed, but it's only small stuff
   and it should hopefully cause less mainteance overhead longer term.

 - Fix warnings
 - Merge cpuid.c with i386.c
 - Sync msr.c with i386
 - Consolidate externs in asm/proto.h
 - sysfs/sysdev fixes for apic/nmi (Bryan O'Sullivan)
 - Fix /proc/kcore access
 - Add real kern_addr_valid (used for above).
 - Support consistent dma_mask in IOMMU
 - Fix double print of AMD for CPU model.
 - Remove unused wakeup.S file.
 - Remove obsolete CONFIG_SIMNOW ifdef.
 - Support ptrace access for 32bit vsyscalls.
 - Fix warnings in 32bit boot code compilation.

Handle both unsigned int and unsigned long in rtc_read. This helps
when running 32bit userland under an 64bit kernel.