summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard2011-08-26 19:52:14 +0200
committerMatt Turner2012-05-24 20:27:55 +0200
commit50744dee010657f0e0bd97e32651061109f1207a (patch)
tree7193fc7926599cbbe80cf5b0ab09dec89a6e6a4d
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff)
downloadkernel-qcow2-linux-50744dee010657f0e0bd97e32651061109f1207a.tar.gz
kernel-qcow2-linux-50744dee010657f0e0bd97e32651061109f1207a.tar.xz
kernel-qcow2-linux-50744dee010657f0e0bd97e32651061109f1207a.zip
alpha: implement setsysinfo(SSI_LMF) as a no-op
This allows running software using the Tru64 license manager. For simplicity, no check for a valid license is done. This should not be seen as encouraging software piracy. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--arch/alpha/include/asm/sysinfo.h1
-rw-r--r--arch/alpha/kernel/osf_sys.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/sysinfo.h b/arch/alpha/include/asm/sysinfo.h
index e77d77cd07b8..0b80e79d75e5 100644
--- a/arch/alpha/include/asm/sysinfo.h
+++ b/arch/alpha/include/asm/sysinfo.h
@@ -15,6 +15,7 @@
#define GSI_GET_HWRPB 101
#define SSI_NVPAIRS 1
+#define SSI_LMF 7
#define SSI_IEEE_FP_CONTROL 14
#define SSI_IEEE_STATE_AT_SIGNAL 15
#define SSI_IEEE_IGNORE_STATE_AT_SIGNAL 16
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 49ee3193477a..9a81044a8947 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -771,6 +771,9 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer,
return 0;
}
+ case SSI_LMF:
+ return 0;
+
default:
break;
}