5 files changed, 17 insertions, 17 deletions

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 5fed98ca0e1f..e2d30b8e08a2 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -205,7 +205,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
         struct alt_instr *a;
         char insnbuf[MAX_PATCH_LEN];
 
-        DPRINTK("%s: alt table %p -> %p\n", __FUNCTION__, start, end);
+        DPRINTK("%s: alt table %p -> %p\n", __func__, start, end);
         for (a = start; a < end; a++) {
                 u8 *instr = a->instr;
                 BUG_ON(a->replacementlen > a->instrlen);
@@ -217,7 +217,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
                 if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) {
                         instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0));
                         DPRINTK("%s: vsyscall fixup: %p => %p\n",
-                                __FUNCTION__, a->instr, instr);
+                                __func__, a->instr, instr);
                 }
 #endif
                 memcpy(insnbuf, a->replacement, a->replacementlen);
@@ -307,7 +307,7 @@ void alternatives_smp_module_add(struct module *mod, char *name,
         smp->text       = text;
         smp->text_end   = text_end;
         DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n",
-                __FUNCTION__, smp->locks, smp->locks_end,
+                __func__, smp->locks, smp->locks_end,
                 smp->text, smp->text_end, smp->name);
 
         spin_lock_irqsave(&smp_alt, flags);
@@ -332,7 +332,7 @@ void alternatives_smp_module_del(struct module *mod)
                         continue;
                 list_del(&item->next);
                 spin_unlock_irqrestore(&smp_alt, flags);
-                DPRINTK("%s: %s\n", __FUNCTION__, item->name);
+                DPRINTK("%s: %s\n", __func__, item->name);
                 kfree(item);
                 return;
         }
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index cef054b09d27..6ea67b76a214 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -79,7 +79,7 @@ unsigned int do_IRQ(struct pt_regs *regs)
 
         if (unlikely((unsigned)irq >= NR_IRQS)) {
                 printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
-                                        __FUNCTION__, irq);
+                                        __func__, irq);
                 BUG();
         }
 
diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/kernel/srat_32.c
index b72e61359c36..70e4a374b4e8 100644
--- a/arch/x86/kernel/srat_32.c
+++ b/arch/x86/kernel/srat_32.c
@@ -277,14 +277,14 @@ int __init get_memcfg_from_srat(void)
         rsdp_address = acpi_os_get_root_pointer();
         if (!rsdp_address) {
                 printk("%s: System description tables not found\n",
-                       __FUNCTION__);
+                       __func__);
                 goto out_err;
         }
 
-        printk("%s: assigning address to rsdp\n", __FUNCTION__);
+        printk("%s: assigning address to rsdp\n", __func__);
         rsdp = (struct acpi_table_rsdp *)(u32)rsdp_address;
         if (!rsdp) {
-                printk("%s: Didn't find ACPI root!\n", __FUNCTION__);
+                printk("%s: Didn't find ACPI root!\n", __func__);
                 goto out_err;
         }
 
@@ -292,7 +292,7 @@ int __init get_memcfg_from_srat(void)
                 rsdp->oem_id);
 
         if (strncmp(rsdp->signature, ACPI_SIG_RSDP,strlen(ACPI_SIG_RSDP))) {
-                printk(KERN_WARNING "%s: RSDP table signature incorrect\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: RSDP table signature incorrect\n", __func__);
                 goto out_err;
         }
 
@@ -302,7 +302,7 @@ int __init get_memcfg_from_srat(void)
         if (!rsdt) {
                 printk(KERN_WARNING
                        "%s: ACPI: Invalid root system description tables (RSDT)\n",
-                       __FUNCTION__);
+                       __func__);
                 goto out_err;
         }
 
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index c7b579db843d..30f04c3e68e4 100644
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -47,7 +47,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
                 }
         }
         if (i == rio_table_hdr->num_rio_dev) {
-                printk(KERN_ERR "%s: Couldn't find owner Cyclone for Winnipeg!\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Couldn't find owner Cyclone for Winnipeg!\n", __func__);
                 return last_bus;
         }
 
@@ -58,7 +58,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
                 }
         }
         if (i == rio_table_hdr->num_scal_dev) {
-                printk(KERN_ERR "%s: Couldn't find owner Twister for Cyclone!\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Couldn't find owner Twister for Cyclone!\n", __func__);
                 return last_bus;
         }
 
@@ -88,7 +88,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
                 num_buses = 9;
                 break;
         default:
-                printk(KERN_INFO "%s: Unsupported Winnipeg type!\n", __FUNCTION__);
+                printk(KERN_INFO "%s: Unsupported Winnipeg type!\n", __func__);
                 return last_bus;
         }
 
@@ -103,13 +103,13 @@ static int __init build_detail_arrays(void)
         int i, scal_detail_size, rio_detail_size;
 
         if (rio_table_hdr->num_scal_dev > MAX_NUMNODES) {
-                printk(KERN_WARNING "%s: MAX_NUMNODES too low!  Defined as %d, but system has %d nodes.\n", __FUNCTION__, MAX_NUMNODES, rio_table_hdr->num_scal_dev);
+                printk(KERN_WARNING "%s: MAX_NUMNODES too low!  Defined as %d, but system has %d nodes.\n", __func__, MAX_NUMNODES, rio_table_hdr->num_scal_dev);
                 return 0;
         }
 
         switch (rio_table_hdr->version) {
         default:
-                printk(KERN_WARNING "%s: Invalid Rio Grande Table Version: %d\n", __FUNCTION__, rio_table_hdr->version);
+                printk(KERN_WARNING "%s: Invalid Rio Grande Table Version: %d\n", __func__, rio_table_hdr->version);
                 return 0;
         case 2:
                 scal_detail_size = 11;
@@ -154,7 +154,7 @@ void __init setup_summit(void)
                 offset = *((unsigned short *)(ptr + offset));
         }
         if (!rio_table_hdr) {
-                printk(KERN_ERR "%s: Unable to locate Rio Grande Table in EBDA - bailing!\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Unable to locate Rio Grande Table in EBDA - bailing!\n", __func__);
                 return;
         }
 
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 3335b4595efd..af65b2da3ba0 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -661,7 +661,7 @@ static int lguest_clockevent_set_next_event(unsigned long delta,
         if (delta < LG_CLOCK_MIN_DELTA) {
                 if (printk_ratelimit())
                         printk(KERN_DEBUG "%s: small delta %lu ns\n",
-                               __FUNCTION__, delta);
+                               __func__, delta);
                 return -ETIME;
         }