sh: Fix up the cpu_asid() return value on nommu.

This ought to be unsigned long, rather than defaulting to int.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index 04c0c9733ad62b19bc1323bf002b655eea47590c..5d9157bd474df7b6988f512e85389b1b31da0d5a 100644 (file)
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -22,7 +22,7 @@
 #define MMU_CONTEXT_ASID_MASK          0x000000ff
 #define MMU_CONTEXT_VERSION_MASK       0xffffff00
 #define MMU_CONTEXT_FIRST_VERSION      0x00000100
-#define NO_CONTEXT                     0
+#define NO_CONTEXT                     0UL
 
 /* ASID is 8-bit value, so it can't be 0x100 */
 #define MMU_NO_ASID                    0x100
@@ -130,7 +130,7 @@ static inline void switch_mm(struct mm_struct *prev,
 #define destroy_context(mm)            do { } while (0)
 #define set_asid(asid)                 do { } while (0)
 #define get_asid()                     (0)
-#define cpu_asid(cpu, mm)              ({ (void)cpu; 0; })
+#define cpu_asid(cpu, mm)              ({ (void)cpu; NO_CONTEXT; })
 #define switch_and_save_asid(asid)     (0)
 #define set_TTB(pgd)                   do { } while (0)
 #define get_TTB()                      (0)

diff --git a/arch/sh/mm/asids-debugfs.c b/arch/sh/mm/asids-debugfs.c
index 0678a1044a9a2a16ed5fca186d3b3057c6721a3f..8e912a15e94f4583e1f4a8fe488b1dc45128e766 100644 (file)
--- a/arch/sh/mm/asids-debugfs.c
+++ b/arch/sh/mm/asids-debugfs.c
@@ -37,7 +37,7 @@ static int asids_seq_show(struct seq_file *file, void *iter)
                        continue;
 
                if (p->mm)
-                       seq_printf(file, "%5d : %02x\n", pid,
+                       seq_printf(file, "%5d : %02lx\n", pid,
                                   cpu_asid(smp_processor_id(), p->mm));
                else
                        seq_printf(file, "%5d : (none)\n", pid);