Messages in this thread Patch in this message |  | | Date | Fri, 18 Jan 2013 13:29:04 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the driver-core tree |
| |
Hi Greg,
After merging the driver-core tree, today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/net/wireless/ath/wil6210/wil6210.h:24:0, from drivers/net/wireless/ath/wil6210/main.c:26: drivers/net/wireless/ath/wil6210/dbg_hexdump.h:21:0: error: "print_hex_dump_bytes" redefined [-Werror] include/linux/printk.h:322:0: note: this is the location of the previous definition
Caused by commit 7a555613eb77 ("dynamic_debug: dynamic hex dump") interacting with commit 2be7d22f0625 ("wireless: add new wil6210 802.11ad 60GHz driver") that was added to Linus' tree in the last few days.
I have applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 18 Jan 2013 13:24:32 +1100 Subject: [PATCH] wireless: remove conflicting version of print_hex_dump_bytes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/wireless/ath/wil6210/dbg_hexdump.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/dbg_hexdump.h b/drivers/net/wireless/ath/wil6210/dbg_hexdump.h index 6a315ba..e5712f0 100644 --- a/drivers/net/wireless/ath/wil6210/dbg_hexdump.h +++ b/drivers/net/wireless/ath/wil6210/dbg_hexdump.h @@ -1,25 +1,15 @@ #ifndef WIL_DBG_HEXDUMP_H_ #define WIL_DBG_HEXDUMP_H_ -#if defined(CONFIG_DYNAMIC_DEBUG) -#define wil_dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) \ -do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, \ - __builtin_constant_p(prefix_str) ? prefix_str : "hexdump");\ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \ - print_hex_dump(KERN_DEBUG, prefix_str, \ - prefix_type, rowsize, groupsize, \ - buf, len, ascii); \ -} while (0) +#include <linux/printk.h> +#include <linux/dynamic_debug.h> +#if defined(CONFIG_DYNAMIC_DEBUG) #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \ - wil_dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ + dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) -#define print_hex_dump_bytes(prefix_str, prefix_type, buf, len) \ - wil_dynamic_hex_dump(prefix_str, prefix_type, 16, 1, buf, len, true) #else /* defined(CONFIG_DYNAMIC_DEBUG) */ #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \ -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |