Skip to contentSkip to conversation

unicore32: mm: Add missing parameter to arch_vma_access_permitted

PATCH In review Guenter Roeck 2 participants 6 messages Mar 21, 2016 – Apr 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 unicore32: mm: Add missing parameter to arch_vma_access_permitted

unicore32 fails to compile with the following errors.

mm/memory.c: In function ‘__handle_mm_fault’:
mm/memory.c:3381: error:
too many arguments to function ‘arch_vma_access_permitted’
mm/gup.c: In function ‘check_vma_flags’:
mm/gup.c:456: error:
too many arguments to function ‘arch_vma_access_permitted’
mm/gup.c: In function ‘vma_permits_fault’:
mm/gup.c:640: error:
too many arguments to function ‘arch_vma_access_permitted’

Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate instruction fetches")
Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 arch/unicore32/include/asm/mmu_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */
 	return true;
Signature · 1 line
2.5.0
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines

unicore32 fails to compile with the following errors.

mm/memory.c: In function 鈥榑_handle_mm_fault鈥&#65533;:
mm/memory.c:3381: error:

	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榗heck_vma_flags鈥&#65533;:
mm/gup.c:456: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榲ma_permits_fault鈥&#65533;:
mm/gup.c:640: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
Quoted 6 lines
Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate instruction

fetches")

Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>

Thanks.

Quoted 22 lines
---
 arch/unicore32/include/asm/mmu_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct
 *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */

return true;
--
2.5.0

#2 lore raw
Quoted 19 lines · Xuetao Guan
Quoted 12 lines

unicore32 fails to compile with the following errors.

mm/memory.c: In function 鈥榑_handle_mm_fault鈥&#65533;:
mm/memory.c:3381: error:

	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榗heck_vma_flags鈥&#65533;:
mm/gup.c:456: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榲ma_permits_fault鈥&#65533;:
mm/gup.c:640: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
Quoted 6 lines
Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate instruction

fetches")

Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Quoted 4 lines

Thanks.

Who is going to send the patch upstream ?

Guenter

Quoted 23 lines
Quoted 22 lines
---
 arch/unicore32/include/asm/mmu_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct
 *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */

return true;
--
2.5.0

#3 lore raw
Quoted 24 lines · Xuetao Guan
Quoted 23 lines
Quoted 5 lines

unicore32 fails to compile with the following errors.

mm/memory.c: In function 閳ユ_handle_mm_fault閳&#65533;&#65533;:
mm/memory.c:3381: error:
too many arguments to function

閳ユrch_vma_access_permitted閳&#65533;&#65533;

Quoted 3 lines

mm/gup.c: In function 閳ユheck_vma_flags閳&#65533;&#65533;:
mm/gup.c:456: error:
too many arguments to function

閳ユrch_vma_access_permitted閳&#65533;&#65533;

Quoted 3 lines

mm/gup.c: In function 閳ユΣma_permits_fault閳&#65533;&#65533;:
mm/gup.c:640: error:
too many arguments to function

閳ユrch_vma_access_permitted閳&#65533;&#65533;

Quoted 2 lines
Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate

instruction

Quoted 5 lines

fetches")

Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Quoted 7 lines
Quoted 4 lines

Thanks.

Who is going to send the patch upstream ?

Guenter

I will do. Thanks.

Xuetao

Quoted 27 lines
Quoted 26 lines

arch/unicore32/include/asm/mmu_context.h static inline void arch_bprm_mm_init(struct

Quoted 11 lines
---
 arch/unicore32/include/asm/mmu_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +0 -0
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct

mm_struct

arch/unicore32/include/asm/mmu_context.h static inline void arch_bprm_mm_init(struct · line 101

Quoted 4 lines
arch/unicore32/include/asm/mmu_context.h +0 -0
 *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct

*vma,

Quoted 8 lines
arch/unicore32/include/asm/mmu_context.h +1 -1
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */

return true;
--
2.5.0

#4 lore raw
In reply to Guenter Roeck

ping ... still not upstream.

Quoted 35 lines · Guenter Roeck

unicore32 fails to compile with the following errors.

mm/memory.c: In function ‘__handle_mm_fault’:
mm/memory.c:3381: error:
too many arguments to function ‘arch_vma_access_permitted’
mm/gup.c: In function ‘check_vma_flags’:
mm/gup.c:456: error:
too many arguments to function ‘arch_vma_access_permitted’
mm/gup.c: In function ‘vma_permits_fault’:
mm/gup.c:640: error:
too many arguments to function ‘arch_vma_access_permitted’

Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate instruction fetches")
Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
  arch/unicore32/include/asm/mmu_context.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
  }
 
  static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
  {
  	/* by default, allow everything */
  	return true;
#5 lore raw
Quoted 1 line

ping ... still not upstream.

I'm sorry.
I'll do it in next week.

Xuetao

Quoted 42 lines · Guenter Roeck
Quoted 39 lines

unicore32 fails to compile with the following errors.

mm/memory.c: In function 鈥榑_handle_mm_fault鈥&#65533;:
mm/memory.c:3381: error:

	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榗heck_vma_flags鈥&#65533;:
mm/gup.c:456: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
mm/gup.c: In function 鈥榲ma_permits_fault鈥&#65533;:
mm/gup.c:640: error:
	too many arguments to function 鈥榓rch_vma_access_permitted鈥&#65533;
Fixes d61172b4b695b ("mm/core, x86/mm/pkeys: Differentiate instruction

fetches")

Cc Dave Hansen <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
  arch/unicore32/include/asm/mmu_context.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct
 *mm,
  }
 
  static inline bool arch_vma_access_permitted(struct vm_area_struct
 *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
  {

/* by default, allow everything */ return true;