58,87d57
< #ifdef CFG_64BIT_STRTOUL
< unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int base)
< {
< 	unsigned long long result = 0, value;
< 
< 	if (*cp == '0') {
< 		cp++;
< 		if ((*cp == 'x') && isxdigit (cp[1])) {
< 			base = 16;
< 			cp++;
< 		}
< 		if (!base) {
< 			base = 8;
< 		}
< 	}
< 	if (!base) {
< 		base = 10;
< 	}
< 	while (isxdigit (*cp) && (value = isdigit (*cp)
< 				? *cp - '0'
< 				: (islower (*cp) ? toupper (*cp) : *cp) - 'A' + 10) < base) {
< 		result = result * base + value;
< 		cp++;
< 	}
< 	if (endp)
< 		*endp = (char *) cp;
< 	return result;
< }
< #endif /* CFG_64BIT_STRTOUL */
< 
109,113c79,82
< 	int __res; \
< 	__res = ((unsigned long) n) % (unsigned) base; \
< 	n = ((unsigned long) n) / (unsigned) base; \
< 	__res; \
< })
---
> int __res; \
> __res = ((unsigned long) n) % (unsigned) base; \
> n = ((unsigned long) n) / (unsigned) base; \
> __res; })
115,119c84,85
< #ifdef CFG_64BIT_VSPRINTF
< static char * number(char * str, long long num, int base, int size, int precision ,int type)
< #else
< static char * number(char * str, long num, int base, int size, int precision ,int type)
< #endif
---
> static char * number(char * str, long num, int base, int size, int precision
> 	,int type)
191,193d156
< #ifdef CFG_64BIT_VSPRINTF
< 	unsigned long long num;
< #else
195d157
< #endif
205c167
< 	int qualifier;		/* 'h', 'l', or 'q' for integer fields */
---
> 	int qualifier;		/* 'h', 'l', or 'L' for integer fields */
256c218
< 		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'q') {
---
> 		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
340,344d301
< #ifdef CFG_64BIT_VSPRINTF
< 		if (qualifier == 'q')  /* "quad" for 64 bit variables */
< 			num = va_arg(args, unsigned long long);
< 		else
< #endif
