aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-04 18:23:47 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-03-05 21:18:22 -0500
commit866e6b9e5019e210d96ced31fbae531ed756e486 (patch)
tree2750282fb2fddcfa609ac8579afdb776177cff90 /arch/sh/mm
parentad0caae0ded1af2a0a41f93356587e1c24d76725 (diff)
sh: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/init.c2
-rw-r--r--arch/sh/mm/ioremap_32.c2
-rw-r--r--arch/sh/mm/ioremap_64.c4
-rw-r--r--arch/sh/mm/tlbflush_64.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e2ed6dd252b9..53dde0607362 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -328,7 +328,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
328 /* We only have ZONE_NORMAL, so this is easy.. */ 328 /* We only have ZONE_NORMAL, so this is easy.. */
329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages); 329 ret = __add_pages(pgdat->node_zones + ZONE_NORMAL, start_pfn, nr_pages);
330 if (unlikely(ret)) 330 if (unlikely(ret))
331 printk("%s: Failed, __add_pages() == %d\n", __FUNCTION__, ret); 331 printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
332 332
333 return ret; 333 return ret;
334} 334}
diff --git a/arch/sh/mm/ioremap_32.c b/arch/sh/mm/ioremap_32.c
index 0c7b7e33abdc..882a32ebc6b7 100644
--- a/arch/sh/mm/ioremap_32.c
+++ b/arch/sh/mm/ioremap_32.c
@@ -141,7 +141,7 @@ void __iounmap(void __iomem *addr)
141 141
142 p = remove_vm_area((void *)(vaddr & PAGE_MASK)); 142 p = remove_vm_area((void *)(vaddr & PAGE_MASK));
143 if (!p) { 143 if (!p) {
144 printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr); 144 printk(KERN_ERR "%s: bad address %p\n", __func__, addr);
145 return; 145 return;
146 } 146 }
147 147
diff --git a/arch/sh/mm/ioremap_64.c b/arch/sh/mm/ioremap_64.c
index e27d16519235..cea224c3e49b 100644
--- a/arch/sh/mm/ioremap_64.c
+++ b/arch/sh/mm/ioremap_64.c
@@ -178,7 +178,7 @@ static unsigned long shmedia_alloc_io(unsigned long phys, unsigned long size,
178 } else { 178 } else {
179 if (!printed_full) { 179 if (!printed_full) {
180 printk("%s: done with statics, switching to kmalloc\n", 180 printk("%s: done with statics, switching to kmalloc\n",
181 __FUNCTION__); 181 __func__);
182 printed_full = 1; 182 printed_full = 1;
183 } 183 }
184 tlen = strlen(name); 184 tlen = strlen(name);
@@ -352,7 +352,7 @@ void onchip_unmap(unsigned long vaddr)
352 res = shmedia_find_resource(&shmedia_iomap, vaddr); 352 res = shmedia_find_resource(&shmedia_iomap, vaddr);
353 if (!res) { 353 if (!res) {
354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n", 354 printk(KERN_ERR "%s: Failed to free 0x%08lx\n",
355 __FUNCTION__, vaddr); 355 __func__, vaddr);
356 return; 356 return;
357 } 357 }
358 358
diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 2a98c9ec88ff..7876997ba19a 100644
--- a/arch/sh/mm/tlbflush_64.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -131,7 +131,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
131#ifdef DEBUG_FAULT 131#ifdef DEBUG_FAULT
132 print_task(tsk); 132 print_task(tsk);
133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 133 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
134 __FUNCTION__,__LINE__, 134 __func__, __LINE__,
135 address,regs->pc,textaccess,writeaccess); 135 address,regs->pc,textaccess,writeaccess);
136 show_regs(regs); 136 show_regs(regs);
137#endif 137#endif
@@ -145,7 +145,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
145#ifdef DEBUG_FAULT 145#ifdef DEBUG_FAULT
146 print_task(tsk); 146 print_task(tsk);
147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 147 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
148 __FUNCTION__,__LINE__, 148 __func__, __LINE__,
149 address,regs->pc,textaccess,writeaccess); 149 address,regs->pc,textaccess,writeaccess);
150 show_regs(regs); 150 show_regs(regs);
151 151
@@ -157,7 +157,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
157#ifdef DEBUG_FAULT 157#ifdef DEBUG_FAULT
158 print_task(tsk); 158 print_task(tsk);
159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n", 159 printk("%s:%d fault, address is 0x%08x PC %016Lx textaccess %d writeaccess %d\n",
160 __FUNCTION__,__LINE__, 160 __func__, __LINE__,
161 address,regs->pc,textaccess,writeaccess); 161 address,regs->pc,textaccess,writeaccess);
162 show_regs(regs); 162 show_regs(regs);
163#endif 163#endif