diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-28 17:21:07 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-01 05:43:09 -0400 |
commit | e48b1b452ff630288c930fd8e0c2d808bc15f7ad (patch) | |
tree | 7ba5f83964a1d965d8b8b6187b39083e1a99dfd2 /arch/powerpc/platforms/cell/iommu.c | |
parent | a78bfbfcfaca64e6198f164c43a60afc8a50e2c6 (diff) |
[POWERPC] Replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/iommu.c')
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 49fe641d4345..45646b2b4af4 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct cbe_iommu *iommu, | |||
316 | segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT; | 316 | segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT; |
317 | 317 | ||
318 | pr_debug("%s: iommu[%d]: segments: %lu\n", | 318 | pr_debug("%s: iommu[%d]: segments: %lu\n", |
319 | __FUNCTION__, iommu->nid, segments); | 319 | __func__, iommu->nid, segments); |
320 | 320 | ||
321 | /* set up the segment table */ | 321 | /* set up the segment table */ |
322 | stab_size = segments * sizeof(unsigned long); | 322 | stab_size = segments * sizeof(unsigned long); |
@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu, | |||
343 | (1 << 12) / sizeof(unsigned long)); | 343 | (1 << 12) / sizeof(unsigned long)); |
344 | 344 | ||
345 | ptab_size = segments * pages_per_segment * sizeof(unsigned long); | 345 | ptab_size = segments * pages_per_segment * sizeof(unsigned long); |
346 | pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __FUNCTION__, | 346 | pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __func__, |
347 | iommu->nid, ptab_size, get_order(ptab_size)); | 347 | iommu->nid, ptab_size, get_order(ptab_size)); |
348 | page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size)); | 348 | page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size)); |
349 | BUG_ON(!page); | 349 | BUG_ON(!page); |
@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu, | |||
355 | n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12; | 355 | n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12; |
356 | 356 | ||
357 | pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n", | 357 | pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n", |
358 | __FUNCTION__, iommu->nid, iommu->stab, ptab, | 358 | __func__, iommu->nid, iommu->stab, ptab, |
359 | n_pte_pages); | 359 | n_pte_pages); |
360 | 360 | ||
361 | /* initialise the STEs */ | 361 | /* initialise the STEs */ |
@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(struct cbe_iommu *iommu) | |||
394 | 394 | ||
395 | if (cell_iommu_find_ioc(iommu->nid, &xlate_base)) | 395 | if (cell_iommu_find_ioc(iommu->nid, &xlate_base)) |
396 | panic("%s: missing IOC register mappings for node %d\n", | 396 | panic("%s: missing IOC register mappings for node %d\n", |
397 | __FUNCTION__, iommu->nid); | 397 | __func__, iommu->nid); |
398 | 398 | ||
399 | iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size); | 399 | iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size); |
400 | iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset; | 400 | iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset; |