aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh64')
-rw-r--r--arch/sh64/mach-cayman/setup.c6
-rw-r--r--arch/sh64/mm/ioremap.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh64/mach-cayman/setup.c
index d84895dda3cd..3ed87cd059d0 100644
--- a/arch/sh64/mach-cayman/setup.c
+++ b/arch/sh64/mach-cayman/setup.c
@@ -112,8 +112,10 @@ struct resource io_resources[] = {
112}; 112};
113 113
114struct resource kram_resources[] = { 114struct resource kram_resources[] = {
115 { "Kernel code", 0, 0 }, /* These must be last in the array */ 115 /* These must be last in the array */
116 { "Kernel data", 0, 0 } /* These must be last in the array */ 116 { .name = "Kernel code", .start = 0, .end = 0 },
117 /* These must be last in the array */
118 { .name = "Kernel data", .start = 0, .end = 0 }
117}; 119};
118 120
119struct resource xram_resources[] = { 121struct resource xram_resources[] = {
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
index fb1866fa2c9d..80c56754f513 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
@@ -449,7 +449,9 @@ ioremap_proc_info(char *buf, char **start, off_t fpos, int length, int *eof,
449 if (p + 32 >= e) /* Better than nothing */ 449 if (p + 32 >= e) /* Better than nothing */
450 break; 450 break;
451 if ((nm = r->name) == 0) nm = "???"; 451 if ((nm = r->name) == 0) nm = "???";
452 p += sprintf(p, "%08lx-%08lx: %s\n", r->start, r->end, nm); 452 p += sprintf(p, "%08lx-%08lx: %s\n",
453 (unsigned long)r->start,
454 (unsigned long)r->end, nm);
453 } 455 }
454 456
455 return p-buf; 457 return p-buf;