AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2008-12-10 18:17:19 +09:00
parent a99d6fde69
commit 35724a0aed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sh/include/asm/mmu_context.h
View File

@ -22,7 +22,7 @@
#define MMU_CONTEXT_ASID_MASK 0x000000ff #define MMU_CONTEXT_ASID_MASK 0x000000ff
#define MMU_CONTEXT_VERSION_MASK 0xffffff00 #define MMU_CONTEXT_VERSION_MASK 0xffffff00
#define MMU_CONTEXT_FIRST_VERSION 0x00000100 #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 */ /* ASID is 8-bit value, so it can't be 0x100 */
#define MMU_NO_ASID 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 destroy_context(mm) do { } while (0)
#define set_asid(asid) do { } while (0) #define set_asid(asid) do { } while (0)
#define get_asid() (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 switch_and_save_asid(asid) (0)
#define set_TTB(pgd) do { } while (0) #define set_TTB(pgd) do { } while (0)
#define get_TTB() (0) #define get_TTB() (0)

2
arch/sh/mm/asids-debugfs.c
View File

@ -37,7 +37,7 @@ static int asids_seq_show(struct seq_file *file, void *iter)
continue; continue;
if (p->mm) if (p->mm)
seq_printf(file, "%5d : %02x\n", pid, seq_printf(file, "%5d : %02lx\n", pid,
cpu_asid(smp_processor_id(), p->mm)); cpu_asid(smp_processor_id(), p->mm));
else else
seq_printf(file, "%5d : (none)\n", pid); seq_printf(file, "%5d : (none)\n", pid);