So I'd really prefer if we had a separate dummy.c file, like in my take on your previous patch here: http://git.infradead.org/users/hch/misc.git/commitdiff/e01adddc1733fa414dc16cd22e8f58be9b64a025 http://git.infradead.org/users/hch/misc.git/commitdiff/596bde76e5944a3f4beb8c2769067ca88dda127a Otherwise this looks fine. If you don't minde I'll take your patches, apply the move to a separate file and merge it into the above tree.