Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9cb87aaf404110822200ca1e508471f8f083d1de

Authored by Linus Torvalds
3 parents 2a475501b8 5b8fafcac6 062fe8fe51
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

Merge branches 'x86-boot-for-linus' and 'x86-cleanups-for-linus' of git://git.ke… 

…rnel.org/pub/scm/linux/kernel/git/tip/tip

Pull tiny x86 boot cleanups from Ingo Molnar.

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Fix a sanity check in printf.c

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, boot: Fix warning due to undeclared strlen()

Showing 2 changed files Side-by-side Diff

arch/x86/boot/boot.h
Diff comments   View file @ 9cb87aa
... ... @@ -355,6 +355,7 @@
355 355 size_t strnlen(const char *s, size_t maxlen);
356 356 unsigned int atou(const char *s);
357 357 unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
  358 +size_t strlen(const char *s);
358 359  
359 360 /* tty.c */
360 361 void puts(const char *);
arch/x86/boot/printf.c
Diff comments   View file @ 9cb87aa
... ... @@ -55,7 +55,7 @@
55 55 locase = (type & SMALL);
56 56 if (type & LEFT)
57 57 type &= ~ZEROPAD;
58   - if (base < 2 || base > 36)
  58 + if (base < 2 || base > 16)
59 59 return NULL;
60 60 c = (type & ZEROPAD) ? '0' : ' ';
61 61 sign = 0;