Use %pS for actual addresses, otherwise you'll get bad output
on arches like ppc64 where %pF expects a function descriptor.  Even on
other architectures, refrain from setting a bad example that people
copy.

Signed-off-by: Scott Wood <[email protected]>
Cc: [email protected]
Cc: Steven Miao <[email protected]>
---
 arch/blackfin/kernel/setup.c    | 8 ++++----
 arch/blackfin/mach-common/smp.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 4f424ae..bfb3d85 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -1022,15 +1022,15 @@ void __init setup_arch(char **cmdline_p)
                printk(KERN_EMERG "Recovering from DOUBLE FAULT event\n");
 #ifdef CONFIG_DEBUG_DOUBLEFAULT
                /* We assume the crashing kernel, and the current symbol table 
match */
-               printk(KERN_EMERG " While handling exception (EXCAUSE = %#x) at 
%pF\n",
+               printk(KERN_EMERG " While handling exception (EXCAUSE = %#x) at 
%pS\n",
                        initial_pda.seqstat_doublefault & SEQSTAT_EXCAUSE,
                        initial_pda.retx_doublefault);
-               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pF\n",
+               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pS\n",
                        initial_pda.dcplb_doublefault_addr);
-               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pF\n",
+               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pS\n",
                        initial_pda.icplb_doublefault_addr);
 #endif
-               printk(KERN_NOTICE " The instruction at %pF caused a double 
exception\n",
+               printk(KERN_NOTICE " The instruction at %pS caused a double 
exception\n",
                        initial_pda.retx);
        } else if (_bfin_swrst & RESET_WDOG)
                printk(KERN_INFO "Recovering from Watchdog event\n");
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 8ad3e90..375262d 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -285,15 +285,15 @@ void secondary_start_kernel(void)
        if (_bfin_swrst & SWRST_DBL_FAULT_B) {
                printk(KERN_EMERG "CoreB Recovering from DOUBLE FAULT event\n");
 #ifdef CONFIG_DEBUG_DOUBLEFAULT
-               printk(KERN_EMERG " While handling exception (EXCAUSE = %#x) at 
%pF\n",
+               printk(KERN_EMERG " While handling exception (EXCAUSE = %#x) at 
%pS\n",
                        initial_pda_coreb.seqstat_doublefault & SEQSTAT_EXCAUSE,
                        initial_pda_coreb.retx_doublefault);
-               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pF\n",
+               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %pS\n",
                        initial_pda_coreb.dcplb_doublefault_addr);
-               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pF\n",
+               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %pS\n",
                        initial_pda_coreb.icplb_doublefault_addr);
 #endif
-               printk(KERN_NOTICE " The instruction at %pF caused a double 
exception\n",
+               printk(KERN_NOTICE " The instruction at %pS caused a double 
exception\n",
                        initial_pda_coreb.retx);
        }
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to