diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/compaction.c | 4 | ||||
| -rw-r--r-- | mm/slab.h | 2 | ||||
| -rw-r--r-- | mm/vmscan.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index e74aa7ba6..894dddf5a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1294,7 +1294,7 @@ static struct early_suspend kick_compaction_early_suspend_desc = { static int __init compaction_init(void) { - printk("@@@@@@ [%s] Register early suspend callback @@@@@@\n",__FUNCTION__); + printk("@@@@@@ [%s] Register early suspend callback @@@@@@\n",__func__); #ifdef CONFIG_EARLYSUSPEND register_early_suspend(&kick_compaction_early_suspend_desc); #endif @@ -1302,7 +1302,7 @@ static int __init compaction_init(void) } static void __exit compaction_exit(void) { - printk("@@@@@@ [%s] Unregister early suspend callback @@@@@@\n",__FUNCTION__); + printk("@@@@@@ [%s] Unregister early suspend callback @@@@@@\n",__func__); #ifdef CONFIG_EARLYSUSPEND unregister_early_suspend(&kick_compaction_early_suspend_desc); #endif @@ -225,7 +225,7 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x) return cachep; pr_err("%s: Wrong slab cache. %s but object is from %s\n", - __FUNCTION__, cachep->name, s->name); + __func__, cachep->name, s->name); WARN_ON_ONCE(1); return s; } diff --git a/mm/vmscan.c b/mm/vmscan.c index fef051303..78df8fa4b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4012,7 +4012,7 @@ int mtkpasr_isolate_page(struct page *page) /* Lock this zone - USE trylock version! */ if (!spin_trylock_irqsave(&zone->lru_lock, flags)) { printk(KERN_ALERT"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - printk(KERN_ALERT"[%s][%d] Failed to lock this zone!\n",__FUNCTION__,__LINE__); + printk(KERN_ALERT"[%s][%d] Failed to lock this zone!\n",__func__,__LINE__); printk(KERN_ALERT"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); return -EAGAIN; } @@ -4120,7 +4120,7 @@ int mtkpasr_drop_page(struct page *page) /* We don't handle dirty file pages! */ if (PageDirty(page)) { #ifdef CONFIG_MTKPASR_DEBUG - /*printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d]\n\n\n\n\n\n",__FUNCTION__,__LINE__);*/ + /*printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d]\n\n\n\n\n\n",__func__,__LINE__);*/ #endif goto unlock; } @@ -4186,7 +4186,7 @@ int mtkpasr_drop_page(struct page *page) break; default: #ifdef CONFIG_MTKPASR_DEBUG - /*printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d]\n\n\n\n\n\n",__FUNCTION__,__LINE__);*/ + /*printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d]\n\n\n\n\n\n",__func__,__LINE__);*/ #endif goto restore_unmap; } @@ -4203,7 +4203,7 @@ int mtkpasr_drop_page(struct page *page) goto freeit; } else { /* Race! TOCHECK */ - printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d] RACE!!\n\n\n\n\n\n",__FUNCTION__,__LINE__); + printk(KERN_ALERT "\n\n\n\n\n\n [%s][%d] RACE!!\n\n\n\n\n\n",__func__,__LINE__); goto notask; } } |