mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

vsprintf: move %pR resource printf_specs off the stack 

This adds separate I/O and memory specs, so we don't have to change the
field width in a shared spec, which then lets us make all the specs const
and static, since they never change.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bjorn Helgaas 2010-03-05 10:47:37 -07:00 committed by Linus Torvalds
parent b89dc5d6b0
commit 4da0b66c6e
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/vsprintf.c
View File

@ -597,22 +597,29 @@ static char *resource_string(char *buf, char *end, struct resource *res,
#ifndef MEM_RSRC_PRINTK_SIZE #ifndef MEM_RSRC_PRINTK_SIZE
#define MEM_RSRC_PRINTK_SIZE 10 #define MEM_RSRC_PRINTK_SIZE 10
#endif #endif
struct printf_spec hex_spec = { static const struct printf_spec io_spec = {
.base = 16, .base = 16,
.field_width = IO_RSRC_PRINTK_SIZE,
.precision = -1, .precision = -1,
.flags = SPECIAL | SMALL | ZEROPAD, .flags = SPECIAL | SMALL | ZEROPAD,
}; };
struct printf_spec dec_spec = { static const struct printf_spec mem_spec = {
.base = 16,
.field_width = MEM_RSRC_PRINTK_SIZE,
.precision = -1,
.flags = SPECIAL | SMALL | ZEROPAD,
};
static const struct printf_spec dec_spec = {
.base = 10, .base = 10,
.precision = -1, .precision = -1,
.flags = 0, .flags = 0,
}; };
struct printf_spec str_spec = { static const struct printf_spec str_spec = {
.field_width = -1, .field_width = -1,
.precision = 10, .precision = 10,
.flags = LEFT, .flags = LEFT,
}; };
struct printf_spec flag_spec = { static const struct printf_spec flag_spec = {
.base = 16, .base = 16,
.precision = -1, .precision = -1,
.flags = SPECIAL | SMALL, .flags = SPECIAL | SMALL,
@ -628,35 +635,31 @@ static char *resource_string(char *buf, char *end, struct resource *res,
2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)]; 2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)];
char *p = sym, *pend = sym + sizeof(sym); char *p = sym, *pend = sym + sizeof(sym);
int size = -1, addr = 0;
int decode = (fmt[0] == 'R') ? 1 : 0; int decode = (fmt[0] == 'R') ? 1 : 0;
const struct printf_spec *specp;
if (res->flags & IORESOURCE_IO) {
size = IO_RSRC_PRINTK_SIZE;
addr = 1;
} else if (res->flags & IORESOURCE_MEM) {
size = MEM_RSRC_PRINTK_SIZE;
addr = 1;
}
*p++ = '['; *p++ = '[';
if (res->flags & IORESOURCE_IO) if (res->flags & IORESOURCE_IO) {
p = string(p, pend, "io ", str_spec); p = string(p, pend, "io ", str_spec);
else if (res->flags & IORESOURCE_MEM) specp = &io_spec;
} else if (res->flags & IORESOURCE_MEM) {
p = string(p, pend, "mem ", str_spec); p = string(p, pend, "mem ", str_spec);
else if (res->flags & IORESOURCE_IRQ) specp = &mem_spec;
} else if (res->flags & IORESOURCE_IRQ) {
p = string(p, pend, "irq ", str_spec); p = string(p, pend, "irq ", str_spec);
else if (res->flags & IORESOURCE_DMA) specp = &dec_spec;
} else if (res->flags & IORESOURCE_DMA) {
p = string(p, pend, "dma ", str_spec); p = string(p, pend, "dma ", str_spec);
else { specp = &dec_spec;
} else {
p = string(p, pend, "??? ", str_spec); p = string(p, pend, "??? ", str_spec);
specp = &mem_spec;
decode = 0; decode = 0;
} }
hex_spec.field_width = size; p = number(p, pend, res->start, *specp);
p = number(p, pend, res->start, addr ? hex_spec : dec_spec);
if (res->start != res->end) { if (res->start != res->end) {
*p++ = '-'; *p++ = '-';
p = number(p, pend, res->end, addr ? hex_spec : dec_spec); p = number(p, pend, res->end, *specp);
} }
if (decode) { if (decode) {
if (res->flags & IORESOURCE_MEM_64) if (res->flags & IORESOURCE_MEM_64)