3 files changed, 13 insertions, 17 deletions

diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index e77dfe00de36..8fa0791e8a1e 100644
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -87,6 +87,14 @@ config FONT_6x10
           embedded devices with a 320x240 screen, to get a reasonable number
           of characters (53x24) that are still at a readable size.
 
+config FONT_10x18
+        bool "console 10x18 font (not supported by all drivers)" if FONTS
+        depends on FRAMEBUFFER_CONSOLE
+        help
+          This is a high resolution console font for machines with very
+          big letters. It fits between the sun 12x22 and the normal 8x16 font.
+          If other fonts are too big or too small for you, say Y, otherwise say N.
+
 config FONT_SUN8x16
         bool "Sparc console 8x16 font"
         depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
@@ -101,14 +109,6 @@ config FONT_SUN12x22
           big letters (like the letters used in the SPARC PROM). If the
           standard font is unreadable for you, say Y, otherwise say N.
 
-config FONT_10x18
-        bool "console 10x18 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        help
-          This is a high resolution console font for machines with very
-          big letters. It fits between the sun 12x22 and the normal 8x16 font.
-          If other fonts are too big or too small for you, say Y, otherwise say N.
-
 config FONT_AUTOSELECT
         def_bool y
         depends on !FONT_8x8
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 004fc70fc56a..c6cf82242d65 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -651,7 +651,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
 {
         unsigned int offset = 0;
         struct sg_mapping_iter miter;
-        unsigned long flags;
         unsigned int sg_flags = SG_MITER_ATOMIC;
 
         if (to_buffer)
@@ -664,9 +663,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
         if (!sg_miter_skip(&miter, skip))
                 return false;
 
-        local_irq_save(flags);
-
-        while (sg_miter_next(&miter) && offset < buflen) {
+        while ((offset < buflen) && sg_miter_next(&miter)) {
                 unsigned int len;
 
                 len = min(miter.length, buflen - offset);
@@ -681,7 +678,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
 
         sg_miter_stop(&miter);
 
-        local_irq_restore(flags);
         return offset;
 }
 EXPORT_SYMBOL(sg_copy_buffer);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0967771d8f7f..e3bf4e0f10b5 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1739,6 +1739,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  * 'h', 'l', or 'L' for integer fields
  * 'z' support added 23/7/1999 S.H.
  * 'z' changed to 'Z' --davidm 1/25/99
+ * 'Z' changed to 'z' --adobriyan 2017-01-25
  * 't' added for ptrdiff_t
  *
  * @fmt: the format string
@@ -1838,7 +1839,7 @@ qualifier:
         /* get the conversion qualifier */
         qualifier = 0;
         if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
-            _tolower(*fmt) == 'z' || *fmt == 't') {
+            *fmt == 'z' || *fmt == 't') {
                 qualifier = *fmt++;
                 if (unlikely(qualifier == *fmt)) {
                         if (qualifier == 'l') {
@@ -1907,7 +1908,7 @@ qualifier:
         else if (qualifier == 'l') {
                 BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG);
                 spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN);
-        } else if (_tolower(qualifier) == 'z') {
+        } else if (qualifier == 'z') {
                 spec->type = FORMAT_TYPE_SIZE_T;
         } else if (qualifier == 't') {
                 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -2657,7 +2658,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 /* get conversion qualifier */
                 qualifier = -1;
                 if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
-                    _tolower(*fmt) == 'z') {
+                    *fmt == 'z') {
                         qualifier = *fmt++;
                         if (unlikely(qualifier == *fmt)) {
                                 if (qualifier == 'h') {
@@ -2851,7 +2852,6 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         else
                                 *va_arg(args, unsigned long long *) = val.u;
                         break;
-                case 'Z':
                 case 'z':
                         *va_arg(args, size_t *) = val.u;
                         break;