From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Apr 2010 05:21:52 +0000 (-0700)
Subject: sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs.
X-Git-Tag: v2.6.34-rc5~24^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c25e9e6cbe7b233bb91d14d0e2c258bf8e6ec83;p=pandora-kernel.git

sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs.

If we are in an NMI then doing a plain raw_local_irq_disable() will
write PIL_NORMAL_MAX into %pil, which is lower than PIL_NMI, and thus
we'll re-enable NMIs and recurse.

Doing a simple:

	%pil = %pil | PIL_NORMAL_MAX

does what we want, if we're already at PIL_NMI (15) we leave it at
that setting, else we set it to PIL_NORMAL_MAX (14).

This should get the function tracer working on sparc64.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed