Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index b93c2c9ccb1d17c250d4a945e0fea06fff38baf6..f09257c86107c0c64cf58076a9204d1d79bb697c 100644 (file)
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -868,7 +868,7 @@ void ldom_power_off(void)
 
 static void ds_conn_reset(struct ds_info *dp)
 {
-       printk(KERN_ERR "ds-%llu: ds_conn_reset() from %p\n",
+       printk(KERN_ERR "ds-%llu: ds_conn_reset() from %pf\n",
               dp->id, __builtin_return_address(0));
 }
 

diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
index dae85bc2eda5510b632650d62ad8d3be688669ca..f81d038f7340ce6b80cb65e0e27b2e7f2cb9edd2 100644 (file)
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@ -21,7 +21,6 @@
 #include <linux/bitops.h>
 #include <linux/perf_event.h>
 #include <linux/ratelimit.h>
-#include <linux/bitops.h>
 #include <asm/fpumacro.h>
 #include <asm/cacheflush.h>
 

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index cbef74e793b8df9c9f3b7dc474f7a64feb082b3d..f37fbb24458b5c440f313b519f9dcd89ed57310e 100644 (file)
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -705,7 +705,7 @@ static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long ad
                val = srmmu_hwprobe(address);
                if (val != 0 && pte_val(*ptep) != val) {
                        printk("swift_update_mmu_cache: "
-                           "addr %lx put %08x probed %08x from %p\n",
+                           "addr %lx put %08x probed %08x from %pf\n",
                            address, pte_val(*ptep), val,
                            __builtin_return_address(0));
                        srmmu_flush_whole_tlb();