]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
correct vdso version string
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 26 Feb 2010 21:37:54 +0000 (22:37 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:36:53 +0000 (15:36 -0800)
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>
arch/s390/include/asm/vdso.h

index 7bdd7c8ebc91410f6d3eb616fab0d3660a13add7..4a76d9480cce533dd5b95d658acb0c6ecd6808e9 100644 (file)
@@ -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__