On Fri, Sep 26, 2014 at 03:39:49PM +0200, Arnd Bergmann wrote: > On Friday 26 September 2014 10:05:52 Thierry Reding wrote: > > > My original patch to consolidate the read*/write*() and friends > > explicitly avoided the use of macros to do this. The reason was that if > > we have static inline functions in asm-generic/io.h it defines the > > canonical prototype of these functions, so that architectures that want > > to override them can just copy the prototype from there. > > > > So for consistency the above would become: > > > > #ifndef readb_relaxed > > #define readb_relaxed readb_relaxed > > static inline u8 readb_relaxed(const void __iomem *addr) > > { > > return readb(addr); > > } > > #endif > > > > And analogously for the others. For the *_relaxed variants it's perhaps > > not as important because the signature is the same as for the plain > > variants, so I'm not objecting very strongly to the plain macros. > > Ok. I'd prefer the brief version I think. > > Russell found a number of other bugs with the series, the patch below > contains the fixes I've had to do so far. Obviously, this does nothing for the: include/asm-generic/io.h:804:29: error: redefinition of 'virt_to_bus' include/asm-generic/io.h:809:21: error: redefinition of 'bus_to_virt' errors which are also reported in Olof's build system. Given how close we are to the merge window, I'd suggest this stuff gets reverted so that it can have a better period of testing, rather than stuffing it into -next at such a critical time. -- FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html