summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2010-02-26 22:37:54 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 15:36:53 -0800
commitbbdd08ebd2bfa1a6c337e6a85a5bf64223bb41bf (patch)
tree4df31e3fbc6237f27a31e0a01d558f83ed6f42a2 /arch
parent092c913d48c3f592a9ba116429ed7489e4d263e2 (diff)
downloadlwn-bbdd08ebd2bfa1a6c337e6a85a5bf64223bb41bf.tar.gz
lwn-bbdd08ebd2bfa1a6c337e6a85a5bf64223bb41bf.zip
correct vdso version string
commit 13c6680acb3df25722858566b42759215ea5d2e0 upstream. The glibc vdso code for s390 uses the version string 2.6.29, the kernel uses the version string 2.6.26. No wonder the vdso code is never used. The first kernel version to contain the vdso code is 2.6.29 which makes this the correct version. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: maximilian attems <max@stro.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/include/asm/vdso.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h
index 7bdd7c8ebc91..4a76d9480cce 100644
--- a/arch/s390/include/asm/vdso.h
+++ b/arch/s390/include/asm/vdso.h
@@ -7,7 +7,7 @@
#define VDSO32_LBASE 0
#define VDSO64_LBASE 0
-#define VDSO_VERSION_STRING LINUX_2.6.26
+#define VDSO_VERSION_STRING LINUX_2.6.29
#ifndef __ASSEMBLY__