[PATCH] Alpha: unbreak osf_setsysinfo(SSI_NVPAIRS, [SSIN_UACPROC, UAC_SIGBUS])

From: slyich
Date: Thu Aug 11 2011 - 10:51:29 EST


From: Sergei Trofimovich <slyfox@xxxxxxxxxx>

Update 'UAC_SHIFT' to match 'ALPHA_UAC_SHIFT'.

I don't know why kernel maintains 2 copies of the same constant.
One (UAC_SHIFT) is used to shift bits in syscall definition, and
another is in trap handler (ALPHA_UAC_SHIFT).

Was broken by
> commit 745dd2405e281d96c0a449103bdf6a895048f28c
> Author: Michael Cree <mcree@xxxxxxxxxxxx>
> Date: Mon Nov 30 22:44:40 2009 -0500
>
> Alpha: Rearrange thread info flags fixing two regressions
>
> Both regressions fixed by (1) rearranging TIF_NOTIFY_RESUME flag to be
> in lower 8 bits of the thread info flags, and (2) making sure that
> ALPHA_UAC_SHIFT matches the rearrangement of the thread info flags.
>
> Signed-off-by: Michael Cree <mcree@xxxxxxxxxxxx>
> Cc: Richard Henderson <rth@xxxxxxxxxxx>
> Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
> Cc: David Howells <dhowells@xxxxxxxxxx>,
> Signed-off-by: Matt Turner <mattst88@xxxxxxxxx>

Signed-off-by: Sergei Trofimovich <slyfox@xxxxxxxxxx>
Cc: Michael Cree <mcree@xxxxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>,
Cc: Matt Turner <mattst88@xxxxxxxxx>
---
arch/alpha/include/asm/sysinfo.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/alpha/include/asm/sysinfo.h b/arch/alpha/include/asm/sysinfo.h
index 086aba2..42b3edc 100644
--- a/arch/alpha/include/asm/sysinfo.h
+++ b/arch/alpha/include/asm/sysinfo.h
@@ -32,7 +32,7 @@

/* This is the shift that is applied to the UAC bits as stored in the
per-thread flags. See thread_info.h. */
-#define UAC_SHIFT 6
+#define UAC_SHIFT 10

#endif

--
1.7.3.4

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