From befa39b35da6fcf25d5828c7ae0b14e23c1a8ae2 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 11:08:18 +0200 Subject: [GCC4] fix build error in drivers/char/drm-4.0/drmP.h This patch fixes these errors with gcc 4 : gamma_drv.c: In function 'gamma_setup': gamma_drv.c:191: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_takedown': gamma_drv.c:210: error: expected ')' before '__FUNCTION__' gamma_drv.c:258: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_init': gamma_drv.c:348: error: expected ')' before '__FUNCTION__' gamma_drv.c:361: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_cleanup': gamma_drv.c:388: error: expected ')' before '__FUNCTION__' gamma_drv.c:392: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_open': gamma_drv.c:443: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_release': gamma_drv.c:468: error: expected ')' before '__FUNCTION__' gamma_drv.c:477: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_ioctl': gamma_drv.c:510: error: expected ')' before '__FUNCTION__' gamma_drv.c:520: error: expected ')' before '__FUNCTION__' gamma_drv.c: In function 'gamma_unlock': gamma_drv.c:546: error: expected ')' before '__FUNCTION__' gamma_drv.c:551: error: expected ')' before '__FUNCTION__' gamma_drv.c:562: error: expected ')' before '__FUNCTION__' --- drivers/char/drm-4.0/drmP.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/drm-4.0/drmP.h b/drivers/char/drm-4.0/drmP.h index 3a68e0a..dc14f92 100644 --- a/drivers/char/drm-4.0/drmP.h +++ b/drivers/char/drm-4.0/drmP.h @@ -257,9 +257,9 @@ #endif /* Macros to make printk easier */ #define DRM_ERROR(fmt, arg...) \ - printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) + printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg) #define DRM_MEM_ERROR(area, fmt, arg...) \ - printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \ + printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \ drm_mem_stats[area].name , ##arg) #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg) @@ -268,8 +268,8 @@ #define DRM_DEBUG(fmt, arg...) \ do { \ if (drm_flags&DRM_FLAG_DEBUG) \ printk(KERN_DEBUG \ - "[" DRM_NAME ":" __FUNCTION__ "] " fmt , \ - ##arg); \ + "[" DRM_NAME ":%s] " fmt , \ + __FUNCTION__ , ##arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0) -- 1.4.2