Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...

1 files changed, 20 insertions, 0 deletions

diff --git a/arch/parisc/include/uapi/asm/sigcontext.h b/arch/parisc/include/uapi/asm/sigcontext.h
new file mode 100644
index 000000000000..27ef31bb3b6e
--- /dev/null
+++ b/arch/parisc/include/uapi/asm/sigcontext.h
@@ -0,0 +1,20 @@
+#ifndef _ASMPARISC_SIGCONTEXT_H
+#define _ASMPARISC_SIGCONTEXT_H
+
+#define PARISC_SC_FLAG_ONSTACK 1<<0
+#define PARISC_SC_FLAG_IN_SYSCALL 1<<1
+
+/* We will add more stuff here as it becomes necessary, until we know
+   it works. */
+struct sigcontext {
+        unsigned long sc_flags;
+
+        unsigned long sc_gr[32]; /* PSW in sc_gr[0] */
+        unsigned long long sc_fr[32]; /* FIXME, do we need other state info? */
+        unsigned long sc_iasq[2];
+        unsigned long sc_iaoq[2];
+        unsigned long sc_sar; /* cr11 */
+};
+
+
+#endif