into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Alex's change for mem=/max_addr= now needs to include meminit.h
Signed-off-by: Tony Luck <tony.luck@intel.com>

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Acked-by: Mike Habeck <habeck@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Delete hack for supporting simulator for SN platforms. This capability
has been moved into the simulator environment & is no longer required
in the kernel.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

SGI SN code currently makes assumptions about the bits in the LID
register. These assumptions do not conform to the bit specifications
from Intel. For example, SN currently assumes that bits [28:16] of
the LID contain the physical node ID of a node.
 
This patch eliminates these assumptions. A SAL call is now used to translate
LID values to the NASID/subnode/slice values that are needed for SN
platforms. The results of the SAL call are saved in the SN nodepda.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Delete obsolete code that supports the SGI simulator. This
support code has been moved into the fakeprom and is no
longer required in the kernel.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Remove some statements from comments in <asm-ia64/pgtable.h> whose
correctness is page size dependent ... and based on using an 8k
page size, which almost nobody actually uses.
Signed-off-by: Jason Uhlenkott <jasonuhl@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

These errors were found by 'make buildcheck'.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

The procfs handler for /proc/sgi_sn/sn_topology did
not correctly handle multiple slabs in the same brick,
e.g. a brick containing a compute node and an ionode.
Signed-off-by: Mark Goodwin <markgw@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

The valid.oem_data bit is in different positions in each section.  Make
the test for valid oem data a section specific test.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

change-log:
- update comment for pfm_do_fasync()
- fix return value for pfm_smpl_buffer_alloc(). Now
  return ENOMEM instead of EAGAIN when buffer too big
  for RLIMIT_MEMLOCK.
- added missing vm_pgoff initialization in pfm_smpl_buffer_alloc()
- added flags tro debug print in pfm_write_pmcs
- added seed and mask to debug print in pfm_write_pmds
- shorten some of the debug prints
- remove bogus sanity check from pfm_save_regs() in SMP.
  this could cause invalid PMU state restore

signed-off-by: eranian@hpl.hp.com
Signed-off-by: Tony Luck <tony.luck@intel.com>

With this change, there's some extra fuzz introduced that a max_addr
specification will get rounded down to a granule boundary and memory
quantity, when using mem=, will be within a granule size of the
requested amount.  Let me know if anyone finds more problems with it.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Optimize away the unconditional write to debug registers on signal delivery
path.  This is already done on x86_64.

We only need to write to dr7 if there is a breakpoint to re-enable, and 
MOVDR is a serializing instruction, which is expensive.  Getting rid of 
it gets a 33% faster signal delivery path (at least on Xeon - I didn't
test other CPUs, so your gain may vary).

[ Editors note: it's likely only that slow on Netburst.  Serializing is
  not that expensive, but it is likely that writing to %db7 invalidates
  the trace cache, which explains why it's so slow on Xeon - it's not
  just the op itself, it has to re-populate the cache all the time.
					--- Linus ]


Measured delta TSC for three paths on a 2.4GHz Xeon.

1) With unconditional write to dr7 :  800-1000 cycles
2) With conditional write to dr7   :  84-112 cycles
3) With unlikely write to dr7      :  84 cycles

Performance test using divzero microbenchmark (3 million divide by zeros):

With unconditional write:
   7.445 real / 6.136 system
   7.529 real / 6.482 system
   7.541 real / 5.974 system
   7.546 real / 6.217 system
   7.445 real / 6.167 system

With unlikely write:
   5.779 real / 4.518 system
   5.783 real / 4.591 system
   5.552 real / 4.569 system
   5.790 real / 4.528 system
   5.554 real / 4.382 system

That's about a 33% speedup - more than I expected; apparently getting rid
of the serializing instruction makes the do_signal path much faster.

Zachary Amsden (zach@vmware.com)

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

We decided to do this a different way.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

In general it is not safe to do any non-ptrace wakeup of a thread in
TASK_TRACED, because the waking thread could race with a ptrace call
that could be doing things like mucking directly with its kernel stack. 

AFAIK noone has established that whatever clobberation ptrace can do to
a running thread is safe even if it will never return to user mode, so
we can't allow this even for SIGKILL.

What we _can_ safely do is make a thread switching out of TASK_TRACED
resume rather than sitting in TASK_STOPPED if it has a pending SIGKILL
or SIGCONT.  The following patch does this.

This should be sufficient for the shutdown case.  When killing all
processes, if the tracer gets killed first, the tracee goes into
TASK_STOPPED and will be woken and killed by the SIGKILL (same as
before).  If the tracee gets killed first, it gets a pending SIGKILL and
doesn't wake up immediately--but, now, when the tracer gets killed, the
tracee will then wake up to die. 

This will also fix the (same) situations that can arise now where you
have used gdb (or whatever ptrace caller), killed -9 the gdb and the
process being debugged, but still have to kill -CONT the process before
it goes away (now it should just go away either the first time or when
you kill gdb). 
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is a batch of sparse fixes for things in arch/ppc64/* and
include/asm-ppc64/*

More to come of course...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

My latest 8250 patch prevented registration of "empty" ports (ports that
have a 0 iobase in the static table). Unfortunately, some archs seem to rely
on this, and so broke. This patch reverts that part of the patch.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This adds support for the Maple 970FX Eval Board.  It adds the basic
arch support.  For the Maple to be fully functional, it needs a couple
more patches to be applied for IDE and Ethernet that are currently
pending with the respective maintainers of those subsystems.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The iommu_free_table() patch broke g5 only build by adding back some
incestuous relationship between generic code and pSeries code. 

This wraps this in #ifdef as a quick fix until the original author of
the patch comes up with a better solution.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On machines using the "ISU" mecanism for the MPIC, the new driver didn't properly
calculate the new interrupt count when an ISU was added. That would cause later on
failure to request interrupts in the offending range.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The ppc64 PCI code, when parsing the OF tree, may end up getting empty
regions in addition to the "normal" ones for the PHB (some pSeries OF
device-tree contains weird "ranges" properties). These are harmless but
do trigger some annoying warnings during boot, so let's ignore them.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CONFIG_NET_HW_FLOWCONTROL is entirely unused now, and superceded by NAPI in
practice, so remove the dead code
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

into pobox.com:/garz/repo/netdev-2.6/e1000-2

Fix for updated pci_{save,restore}_state()
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

into pobox.com:/garz/repo/netdev-2.6/misc

into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Simplify ipv6_get_saddr(), ipv6_dev_get_saddr() and
rt6_purge_dflt_routers().
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>