From: Greg KH on
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------


From: David S. Miller <davem(a)davemloft.net>

[ Upstream commit 6c94b1ee0ca2bfb526d779c088ec20da6a3761db ]

It currently overlaps the NMI bit.

Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
---
arch/sparc/include/asm/thread_info_64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -121,7 +121,7 @@ struct thread_info {
#define THREAD_SHIFT PAGE_SHIFT
#endif /* PAGE_SHIFT == 13 */

-#define PREEMPT_ACTIVE 0x4000000
+#define PREEMPT_ACTIVE 0x10000000

/*
* macros/functions for gaining access to the thread information structure


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/