From 885d5fec5c153e877d5c3bf9cab2bd4a02bafa93 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 5 Mar 2010 10:47:42 -0700 Subject: [PATCH] --- yaml --- r: 188077 b: refs/heads/master c: 0f4050c7d3ba0275e5f39513c0670a717d43048c h: refs/heads/master i: 188075: afbc77994a0c83e2653b419e87ebd72f90a135ed v: v3 --- [refs] | 2 +- trunk/include/linux/ioport.h | 1 + trunk/lib/vsprintf.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 33b9a47597b1..7e494b23b4b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6 +refs/heads/master: 0f4050c7d3ba0275e5f39513c0670a717d43048c diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h index b126209a40e2..510e4ac918dd 100644 --- a/trunk/include/linux/ioport.h +++ b/trunk/include/linux/ioport.h @@ -39,6 +39,7 @@ struct resource_list { #define IORESOURCE_MEM 0x00000200 #define IORESOURCE_IRQ 0x00000400 #define IORESOURCE_DMA 0x00000800 +#define IORESOURCE_BUS 0x00001000 #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ #define IORESOURCE_READONLY 0x00004000 diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c index 0d461c7c14db..ebbecf90d5d7 100644 --- a/trunk/lib/vsprintf.c +++ b/trunk/lib/vsprintf.c @@ -609,6 +609,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, .precision = -1, .flags = SPECIAL | SMALL | ZEROPAD, }; + static const struct printf_spec bus_spec = { + .base = 16, + .field_width = 2, + .precision = -1, + .flags = SMALL | ZEROPAD, + }; static const struct printf_spec dec_spec = { .base = 10, .precision = -1, @@ -651,6 +657,9 @@ static char *resource_string(char *buf, char *end, struct resource *res, } else if (res->flags & IORESOURCE_DMA) { p = string(p, pend, "dma ", str_spec); specp = &dec_spec; + } else if (res->flags & IORESOURCE_BUS) { + p = string(p, pend, "bus ", str_spec); + specp = &bus_spec; } else { p = string(p, pend, "??? ", str_spec); specp = &mem_spec;