git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
stdio.c
diff --git
a/arch/powerpc/boot/stdio.c
b/arch/powerpc/boot/stdio.c
index
b5aa522
..
5b57800
100644
(file)
--- a/
arch/powerpc/boot/stdio.c
+++ b/
arch/powerpc/boot/stdio.c
@@
-10,7
+10,7
@@
#include <stddef.h>
#include "string.h"
#include "stdio.h"
#include <stddef.h>
#include "string.h"
#include "stdio.h"
-#include "
prom
.h"
+#include "
ops
.h"
size_t strnlen(const char * s, size_t count)
{
size_t strnlen(const char * s, size_t count)
{
@@
-190,7
+190,11
@@
int vsprintf(char *buf, const char *fmt, va_list args)
/* get the conversion qualifier */
qualifier = -1;
/* get the conversion qualifier */
qualifier = -1;
- if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt =='Z') {
+ if (*fmt == 'l' && *(fmt + 1) == 'l') {
+ qualifier = 'q';
+ fmt += 2;
+ } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L'
+ || *fmt == 'Z') {
qualifier = *fmt;
++fmt;
}
qualifier = *fmt;
++fmt;
}
@@
-281,6
+285,10
@@
int vsprintf(char *buf, const char *fmt, va_list args)
num = va_arg(args, unsigned long);
if (flags & SIGN)
num = (signed long) num;
num = va_arg(args, unsigned long);
if (flags & SIGN)
num = (signed long) num;
+ } else if (qualifier == 'q') {
+ num = va_arg(args, unsigned long long);
+ if (flags & SIGN)
+ num = (signed long long) num;
} else if (qualifier == 'Z') {
num = va_arg(args, size_t);
} else if (qualifier == 'h') {
} else if (qualifier == 'Z') {
num = va_arg(args, size_t);
} else if (qualifier == 'h') {
@@
-320,6
+328,7
@@
printf(const char *fmt, ...)
va_start(args, fmt);
n = vsprintf(sprint_buf, fmt, args);
va_end(args);
va_start(args, fmt);
n = vsprintf(sprint_buf, fmt, args);
va_end(args);
- write(stdout, sprint_buf, n);
+ if (console_ops.write)
+ console_ops.write(sprint_buf, n);
return n;
}
return n;
}