Merge branch 'akpm' (patches from Andrew)

Merge third set of updates from Andrew Morton:

 - the rest of MM

   [ This includes getting rid of the numa hinting bits, in favor of
     just generic protnone logic.  Yay.     - Linus ]

 - core kernel

 - procfs

 - some of lib/ (lots of lib/ material this time)

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (104 commits)
  lib/lcm.c: replace include
  lib/percpu_ida.c: remove redundant includes
  lib/strncpy_from_user.c: replace module.h include
  lib/stmp_device.c: replace module.h include
  lib/sort.c: move include inside #if 0
  lib/show_mem.c: remove redundant include
  lib/radix-tree.c: change to simpler include
  lib/plist.c: remove redundant include
  lib/nlattr.c: remove redundant include
  lib/kobject_uevent.c: remove redundant include
  lib/llist.c: remove redundant include
  lib/md5.c: simplify include
  lib/list_sort.c: rearrange includes
  lib/genalloc.c: remove redundant include
  lib/idr.c: remove redundant include
  lib/halfmd4.c: simplify includes
  lib/dynamic_queue_limits.c: simplify includes
  lib/sort.c: use simpler includes
  lib/interval_tree.c: simplify includes
  hexdump: make it return number of bytes placed in buffer
  ...

1 files changed, 11 insertions, 15 deletions

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 58b78ba57439..8f8c4417f228 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -20,19 +20,18 @@
  * @len:        length of buffer
  *
  * This function returns a string formatted to 3 significant figures
- * giving the size in the required units.  Returns 0 on success or
- * error on failure.  @buf is always zero terminated.
+ * giving the size in the required units.  @buf should have room for
+ * at least 9 bytes and will always be zero terminated.
  *
  */
-int string_get_size(u64 size, const enum string_size_units units,
-                    char *buf, int len)
+void string_get_size(u64 size, const enum string_size_units units,
+                     char *buf, int len)
 {
         static const char *const units_10[] = {
-                "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL
+                "B", "kB", "MB", "GB", "TB", "PB", "EB"
         };
         static const char *const units_2[] = {
-                "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB",
-                NULL
+                "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"
         };
         static const char *const *const units_str[] = {
                 [STRING_UNITS_10] = units_10,
@@ -43,13 +42,13 @@ int string_get_size(u64 size, const enum string_size_units units,
                 [STRING_UNITS_2] = 1024,
         };
         int i, j;
-        u64 remainder = 0, sf_cap;
+        u32 remainder = 0, sf_cap;
         char tmp[8];
 
         tmp[0] = '\0';
         i = 0;
         if (size >= divisor[units]) {
-                while (size >= divisor[units] && units_str[units][i]) {
+                while (size >= divisor[units]) {
                         remainder = do_div(size, divisor[units]);
                         i++;
                 }
@@ -60,17 +59,14 @@ int string_get_size(u64 size, const enum string_size_units units,
 
                 if (j) {
                         remainder *= 1000;
-                        do_div(remainder, divisor[units]);
-                        snprintf(tmp, sizeof(tmp), ".%03lld",
-                                 (unsigned long long)remainder);
+                        remainder /= divisor[units];
+                        snprintf(tmp, sizeof(tmp), ".%03u", remainder);
                         tmp[j+1] = '\0';
                 }
         }
 
-        snprintf(buf, len, "%lld%s %s", (unsigned long long)size,
+        snprintf(buf, len, "%u%s %s", (u32)size,
                  tmp, units_str[units][i]);
-
-        return 0;
 }
 EXPORT_SYMBOL(string_get_size);