diff options
-rw-r--r-- | include/linux/ioport.h | 1 | ||||
-rw-r--r-- | lib/vsprintf.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index b126209a40e..510e4ac918d 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -39,6 +39,7 @@ struct resource_list { | |||
39 | #define IORESOURCE_MEM 0x00000200 | 39 | #define IORESOURCE_MEM 0x00000200 |
40 | #define IORESOURCE_IRQ 0x00000400 | 40 | #define IORESOURCE_IRQ 0x00000400 |
41 | #define IORESOURCE_DMA 0x00000800 | 41 | #define IORESOURCE_DMA 0x00000800 |
42 | #define IORESOURCE_BUS 0x00001000 | ||
42 | 43 | ||
43 | #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ | 44 | #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ |
44 | #define IORESOURCE_READONLY 0x00004000 | 45 | #define IORESOURCE_READONLY 0x00004000 |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 0d461c7c14d..ebbecf90d5d 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -609,6 +609,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, | |||
609 | .precision = -1, | 609 | .precision = -1, |
610 | .flags = SPECIAL | SMALL | ZEROPAD, | 610 | .flags = SPECIAL | SMALL | ZEROPAD, |
611 | }; | 611 | }; |
612 | static const struct printf_spec bus_spec = { | ||
613 | .base = 16, | ||
614 | .field_width = 2, | ||
615 | .precision = -1, | ||
616 | .flags = SMALL | ZEROPAD, | ||
617 | }; | ||
612 | static const struct printf_spec dec_spec = { | 618 | static const struct printf_spec dec_spec = { |
613 | .base = 10, | 619 | .base = 10, |
614 | .precision = -1, | 620 | .precision = -1, |
@@ -651,6 +657,9 @@ static char *resource_string(char *buf, char *end, struct resource *res, | |||
651 | } else if (res->flags & IORESOURCE_DMA) { | 657 | } else if (res->flags & IORESOURCE_DMA) { |
652 | p = string(p, pend, "dma ", str_spec); | 658 | p = string(p, pend, "dma ", str_spec); |
653 | specp = &dec_spec; | 659 | specp = &dec_spec; |
660 | } else if (res->flags & IORESOURCE_BUS) { | ||
661 | p = string(p, pend, "bus ", str_spec); | ||
662 | specp = &bus_spec; | ||
654 | } else { | 663 | } else { |
655 | p = string(p, pend, "??? ", str_spec); | 664 | p = string(p, pend, "??? ", str_spec); |
656 | specp = &mem_spec; | 665 | specp = &mem_spec; |