diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-12-10 18:17:19 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-12-22 18:44:03 +0900 |
| commit | 35724a0aed6e62bdad640e8a1b8498329708226f (patch) | |
| tree | c6cff78adaa62df45bd3fcbbbdc0e1d18cc28c17 /arch | |
| parent | a99d6fde69dd9c73ac0b4e42a77ed1ebc714e56a (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/include/asm/mmu_context.h | 4 | ||||
| -rw-r--r-- | arch/sh/mm/asids-debugfs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 04c0c9733ad6..5d9157bd474d 100644 --- 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 0678a1044a9a..8e912a15e94f 100644 --- 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); |