[kernel] r17231 - in dists/sid/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Wed Apr 20 00:41:46 2011
New Revision: 17231

Log:
lib: strict_strto*: Avoid ABI change

Added:
   dists/sid/linux-2.6/debian/patches/debian/lib-strict_strto-Avoid-ABI-change.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/4

Added: dists/sid/linux-2.6/debian/patches/debian/lib-strict_strto-Avoid-ABI-change.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/lib-strict_strto-Avoid-ABI-change.patch	Wed Apr 20 00:41:46 2011	(r17231)
@@ -0,0 +1,60 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] lib: strict_strto*: Avoid ABI change
+
+Keep exporting strict_strto* even though they are now aliases for kstrto*.
+
+diff --git a/include/linux/kernel.h b/include/linux/kernel.h
+index c4b85c9..e725ec7 100644
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -252,6 +252,13 @@ extern unsigned long simple_strtoul(const char *,char **,unsigned int);
+ extern long simple_strtol(const char *,char **,unsigned int);
+ extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
+ extern long long simple_strtoll(const char *,char **,unsigned int);
++
++/* for ABI compatibility */
++extern int __must_check strict_strtoul(const char *, unsigned int, unsigned long *);
++extern int __must_check strict_strtol(const char *, unsigned int, long *);
++extern int __must_check strict_strtoull(const char *, unsigned int, unsigned long long *);
++extern int __must_check strict_strtoll(const char *, unsigned int, long long *);
++
+ #define strict_strtoul	kstrtoul
+ #define strict_strtol	kstrtol
+ #define strict_strtoull	kstrtoull
+diff --git a/lib/vsprintf.c b/lib/vsprintf.c
+index f3fd99a..3b4095c 100644
+--- a/lib/vsprintf.c
++++ b/lib/vsprintf.c
+@@ -120,6 +120,28 @@ long long simple_strtoll(const char *cp, char **endp, unsigned int base)
+ }
+ EXPORT_SYMBOL(simple_strtoll);
+ 
++/* for ABI compatibility */
++#undef strict_strtoul
++#undef strict_strtol
++#undef strict_strtoull
++#undef strict_strtoll
++int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
++{
++	return kstrtoul(cp, base, res);
++}
++EXPORT_SYMBOL(strict_strtoul);
++int strict_strtol(const char *cp, unsigned int base, unsigned long *res)
++{
++	return kstrtol(cp, base, res);
++}
++EXPORT_SYMBOL(strict_strtol);
++int strict_strtoull(const char *cp, unsigned int base, unsigned long *res)
++{
++	return kstrtoull(cp, base, res);
++}
++EXPORT_SYMBOL(strict_strtoull);
++int strict_strtoll(const char *cp, unsigned int base, unsigned long *res)
++{
++	return kstrtoll(cp, base, res);
++}
++EXPORT_SYMBOL(strict_strtoll);
++
+ static noinline_for_stack
+ int skip_atoi(const char **s)
+ {

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	Wed Apr 20 00:20:54 2011	(r17230)
+++ dists/sid/linux-2.6/debian/patches/series/4	Wed Apr 20 00:41:46 2011	(r17231)
@@ -12,3 +12,4 @@
 + debian/ALSA-Restore-snd_pcm_lib_mmap_noncached.patch
 - bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch
 + bugfix/all/stable/2.6.38.4-rc1.patch
++ debian/lib-strict_strto-Avoid-ABI-change.patch