Commit 35724a0a authored by Paul Mundt's avatar Paul Mundt
Browse files

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



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

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a99d6fde

arch/sh/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/sh/mm/asids-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE