small ioremap cleanups

[Christoph Hellwig]

Hi Andrew,

the first patch moves a little code around the vmalloc/ioremap
boundary followed a bigger move by Nick earlier.  The second
enforces non-executable mapping on ioremap just like we do
for vmap.  No driver currently uses executable mappings anyway,
as they should.