redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

s390/mm: rename addressing_mode to s390_user_mode 

Renaming the globally visible variable "user_mode" to "addressing_mode" in
order to fix a name clash was not a good idea. (Commit 37fe1d73 "s390/mm:
rename user_mode variable to addressing_mode")
Looking at the code after a couple of weeks one thinks: addressing mode of
what?
So rename the variable again. This time to s390_user_mode. Which hopefully
makes more sense.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
wifi-calibration
Heiko Carstens 2012-09-02 11:02:23 +02:00 committed by Martin Schwidefsky
parent 46e8894786
commit d1b0d842c4
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/mmu_context.h
View File

@ -57,7 +57,7 @@ static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk)
pgd_t *pgd = mm->pgd; pgd_t *pgd = mm->pgd;
S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd); S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);
if (addressing_mode != HOME_SPACE_MODE) { if (s390_user_mode != HOME_SPACE_MODE) {
/* Load primary space page table origin. */ /* Load primary space page table origin. */
asm volatile(LCTL_OPCODE" 1,1,%0\n" asm volatile(LCTL_OPCODE" 1,1,%0\n"
: : "m" (S390_lowcore.user_asce) ); : : "m" (S390_lowcore.user_asce) );

2
arch/s390/include/asm/setup.h
View File

@ -60,7 +60,7 @@ void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr,
#define SECONDARY_SPACE_MODE 2 #define SECONDARY_SPACE_MODE 2
#define HOME_SPACE_MODE 3 #define HOME_SPACE_MODE 3
extern unsigned int addressing_mode; extern unsigned int s390_user_mode;
/* /*
* Machine features detected in head.S * Machine features detected in head.S

2
arch/s390/kernel/runtime_instr.c
View File

@ -40,7 +40,7 @@ static void disable_runtime_instr(void)
static void init_runtime_instr_cb(struct runtime_instr_cb *cb) static void init_runtime_instr_cb(struct runtime_instr_cb *cb)
{ {
cb->buf_limit = 0xfff; cb->buf_limit = 0xfff;
if (addressing_mode == HOME_SPACE_MODE) if (s390_user_mode == HOME_SPACE_MODE)
cb->home_space = 1; cb->home_space = 1;
cb->int_requested = 1; cb->int_requested = 1;
cb->pstate = 1; cb->pstate = 1;

10
arch/s390/kernel/setup.c
View File

@ -302,8 +302,8 @@ static int __init parse_vmalloc(char *arg)
} }
early_param("vmalloc", parse_vmalloc); early_param("vmalloc", parse_vmalloc);
unsigned int addressing_mode = PRIMARY_SPACE_MODE; unsigned int s390_user_mode = PRIMARY_SPACE_MODE;
EXPORT_SYMBOL_GPL(addressing_mode); EXPORT_SYMBOL_GPL(s390_user_mode);
static int set_amode_primary(void) static int set_amode_primary(void)
{ {
@ -326,9 +326,9 @@ static int set_amode_primary(void)
static int __init early_parse_user_mode(char *p) static int __init early_parse_user_mode(char *p)
{ {
if (p && strcmp(p, "primary") == 0) if (p && strcmp(p, "primary") == 0)
addressing_mode = PRIMARY_SPACE_MODE; s390_user_mode = PRIMARY_SPACE_MODE;
else if (!p || strcmp(p, "home") == 0) else if (!p || strcmp(p, "home") == 0)
addressing_mode = HOME_SPACE_MODE; s390_user_mode = HOME_SPACE_MODE;
else else
return 1; return 1;
return 0; return 0;
@ -337,7 +337,7 @@ early_param("user_mode", early_parse_user_mode);
static void setup_addressing_mode(void) static void setup_addressing_mode(void)
{ {
if (addressing_mode == PRIMARY_SPACE_MODE) { if (s390_user_mode == PRIMARY_SPACE_MODE) {
if (set_amode_primary()) if (set_amode_primary())
pr_info("Address spaces switched, " pr_info("Address spaces switched, "
"mvcos available\n"); "mvcos available\n");

8
arch/s390/kernel/vdso.c
View File

@ -85,7 +85,7 @@ struct vdso_data *vdso_data = &vdso_data_store.data;
static void vdso_init_data(struct vdso_data *vd) static void vdso_init_data(struct vdso_data *vd)
{ {
vd->ectg_available = vd->ectg_available =
addressing_mode != HOME_SPACE_MODE && test_facility(31); s390_user_mode != HOME_SPACE_MODE && test_facility(31);
} }
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
@ -102,7 +102,7 @@ int vdso_alloc_per_cpu(struct _lowcore *lowcore)
lowcore->vdso_per_cpu_data = __LC_PASTE; lowcore->vdso_per_cpu_data = __LC_PASTE;
if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled) if (s390_user_mode == HOME_SPACE_MODE || !vdso_enabled)
return 0; return 0;
segment_table = __get_free_pages(GFP_KERNEL, SEGMENT_ORDER); segment_table = __get_free_pages(GFP_KERNEL, SEGMENT_ORDER);
@ -147,7 +147,7 @@ void vdso_free_per_cpu(struct _lowcore *lowcore)
unsigned long segment_table, page_table, page_frame; unsigned long segment_table, page_table, page_frame;
u32 *psal, *aste; u32 *psal, *aste;
if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled) if (s390_user_mode == HOME_SPACE_MODE || !vdso_enabled)
return; return;
psal = (u32 *)(addr_t) lowcore->paste[4]; psal = (u32 *)(addr_t) lowcore->paste[4];
@ -165,7 +165,7 @@ static void vdso_init_cr5(void)
{ {
unsigned long cr5; unsigned long cr5;
if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled) if (s390_user_mode == HOME_SPACE_MODE || !vdso_enabled)
return; return;
cr5 = offsetof(struct _lowcore, paste); cr5 = offsetof(struct _lowcore, paste);
__ctl_load(cr5, 5, 5); __ctl_load(cr5, 5, 5);

2
arch/s390/mm/fault.c
View File

@ -111,7 +111,7 @@ static inline int user_space_fault(unsigned long trans_exc_code)
if (trans_exc_code == 2) if (trans_exc_code == 2)
/* Access via secondary space, set_fs setting decides */ /* Access via secondary space, set_fs setting decides */
return current->thread.mm_segment.ar4; return current->thread.mm_segment.ar4;
if (addressing_mode == HOME_SPACE_MODE) if (s390_user_mode == HOME_SPACE_MODE)
/* User space if the access has been done via home space. */ /* User space if the access has been done via home space. */
return trans_exc_code == 3; return trans_exc_code == 3;
/* /*

2
arch/s390/mm/pgtable.c
View File

@ -796,7 +796,7 @@ int s390_enable_sie(void)
struct mm_struct *mm, *old_mm; struct mm_struct *mm, *old_mm;
/* Do we have switched amode? If no, we cannot do sie */ /* Do we have switched amode? If no, we cannot do sie */
if (addressing_mode == HOME_SPACE_MODE) if (s390_user_mode == HOME_SPACE_MODE)
return -EINVAL; return -EINVAL;
/* Do we have pgstes? if yes, we are done */ /* Do we have pgstes? if yes, we are done */