Merge commit 'v2.6.37-rc8' into x86/apic

Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/parser.c b/lib/parser.c
index fb34977246bb..6e89eca5cca0 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -128,12 +128,13 @@ static int match_number(substring_t *s, int *result, int base)
         char *endp;
         char *buf;
         int ret;
+        size_t len = s->to - s->from;
 
-        buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
+        buf = kmalloc(len + 1, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
-        memcpy(buf, s->from, s->to - s->from);
-        buf[s->to - s->from] = '\0';
+        memcpy(buf, s->from, len);
+        buf[len] = '\0';
         *result = simple_strtol(buf, &endp, base);
         ret = 0;
         if (endp == buf)