Loading arch/sh/mm/ioremap_64.c +1 −5 Original line number Original line Diff line number Diff line Loading @@ -94,7 +94,6 @@ static struct resource *shmedia_find_resource(struct resource *root, static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, const char *name, unsigned long flags) const char *name, unsigned long flags) { { static int printed_full; struct xresource *xres; struct xresource *xres; struct resource *res; struct resource *res; char *tack; char *tack; Loading @@ -108,11 +107,8 @@ static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, tack = xres->xname; tack = xres->xname; res = &xres->xres; res = &xres->xres; } else { } else { if (!printed_full) { printk_once(KERN_NOTICE "%s: done with statics, " printk(KERN_NOTICE "%s: done with statics, " "switching to kmalloc\n", __func__); "switching to kmalloc\n", __func__); printed_full = 1; } tlen = strlen(name); tlen = strlen(name); tack = kmalloc(sizeof(struct resource) + tlen + 1, GFP_KERNEL); tack = kmalloc(sizeof(struct resource) + tlen + 1, GFP_KERNEL); if (!tack) if (!tack) Loading Loading
arch/sh/mm/ioremap_64.c +1 −5 Original line number Original line Diff line number Diff line Loading @@ -94,7 +94,6 @@ static struct resource *shmedia_find_resource(struct resource *root, static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, const char *name, unsigned long flags) const char *name, unsigned long flags) { { static int printed_full; struct xresource *xres; struct xresource *xres; struct resource *res; struct resource *res; char *tack; char *tack; Loading @@ -108,11 +107,8 @@ static void __iomem *shmedia_alloc_io(unsigned long phys, unsigned long size, tack = xres->xname; tack = xres->xname; res = &xres->xres; res = &xres->xres; } else { } else { if (!printed_full) { printk_once(KERN_NOTICE "%s: done with statics, " printk(KERN_NOTICE "%s: done with statics, " "switching to kmalloc\n", __func__); "switching to kmalloc\n", __func__); printed_full = 1; } tlen = strlen(name); tlen = strlen(name); tack = kmalloc(sizeof(struct resource) + tlen + 1, GFP_KERNEL); tack = kmalloc(sizeof(struct resource) + tlen + 1, GFP_KERNEL); if (!tack) if (!tack) Loading