Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging

xen/common/grant_table.c

@@ -3547,10 +3547,10 @@ static void gnttab_usage_print(struct domain *rd)
 static void gnttab_usage_print_all(unsigned char key)
 {
     struct domain *d;
-    printk("%s [ key '%c' pressed\n", __FUNCTION__, key);
+    printk("%s [ key '%c' pressed\n", __func__, key);
     for_each_domain ( d )
         gnttab_usage_print(d);
-    printk("%s ] done\n", __FUNCTION__);
+    printk("%s ] done\n", __func__);
 }
 
 static int __init gnttab_usage_init(void)

xen/common/libelf/libelf-loader.c

@@ -536,12 +536,12 @@ uint64_t elf_lookup_addr(struct elf_binary * elf, const char *symbol)
     sym = elf_sym_by_name(elf, symbol);
     if ( !ELF_HANDLE_VALID(sym) )
     {
-        elf_err(elf, "%s: not found: %s\n", __FUNCTION__, symbol);
+        elf_err(elf, "%s: not found: %s\n", __func__, symbol);
         return -1;
     }
 
     value = elf_uval(elf, sym, st_value);
-    elf_msg(elf, "%s: symbol \"%s\" at 0x%" PRIx64 "\n", __FUNCTION__,
+    elf_msg(elf, "%s: symbol \"%s\" at 0x%" PRIx64 "\n", __func__,
             symbol, value);
     return value;
 }

xen/common/wait.c

@@ -155,7 +155,7 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv)
 
     if ( unlikely(wqv->esp == 0) )
     {
-        gdprintk(XENLOG_ERR, "Stack too large in %s\n", __FUNCTION__);
+        gdprintk(XENLOG_ERR, "Stack too large in %s\n", __func__);
         domain_crash_synchronous();
     }
 

xen/include/acpi/platform/acgcc.h

@@ -46,7 +46,7 @@
 
 /* Function name is used for debug output. Non-ANSI, compiler-dependent */
 
-#define ACPI_GET_FUNCTION_NAME          __FUNCTION__
+#define ACPI_GET_FUNCTION_NAME          __func__
 
 /*
  * This macro is used to tag functions as "printf-like" because