diff options
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/Makefile | 1 | ||||
| -rw-r--r-- | arch/s390/mm/dump_pagetables.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/extmem.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/gup.c | 8 | ||||
| -rw-r--r-- | arch/s390/mm/hugetlbpage.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/maccess.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/mem_detect.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/page-states.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/pageattr.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/pgalloc.c | 1 | ||||
| -rw-r--r-- | arch/s390/mm/vmem.c | 1 | 
13 files changed, 16 insertions, 4 deletions
| diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile index 0aa0ad165d8b..33fe418506bc 100644 --- a/arch/s390/mm/Makefile +++ b/arch/s390/mm/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0  #  # Makefile for the linux s390-specific parts of the memory manager.  # diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c index 049c3c455b32..507f23ba2034 100644 --- a/arch/s390/mm/dump_pagetables.c +++ b/arch/s390/mm/dump_pagetables.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  #include <linux/seq_file.h>  #include <linux/debugfs.h>  #include <linux/sched.h> diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c index 9f118629b55f..920d40894535 100644 --- a/arch/s390/mm/extmem.c +++ b/arch/s390/mm/extmem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Author(s)......: Carsten Otte <[email protected]>   * 		    Rob M van der Heij <[email protected]> diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index bdabb013537b..242b78c0a9ec 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *  S390 version   *    Copyright IBM Corp. 1999 diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c index 8ecc25e760fa..05c8abd864f1 100644 --- a/arch/s390/mm/gup.c +++ b/arch/s390/mm/gup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *  Lockless get_user_pages_fast for s390   * @@ -56,13 +57,12 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,  static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,  		unsigned long end, int write, struct page **pages, int *nr)  { -	unsigned long mask, result;  	struct page *head, *page; +	unsigned long mask;  	int refs; -	result = write ? 0 : _SEGMENT_ENTRY_PROTECT; -	mask = result | _SEGMENT_ENTRY_INVALID; -	if ((pmd_val(pmd) & mask) != result) +	mask = (write ? _SEGMENT_ENTRY_PROTECT : 0) | _SEGMENT_ENTRY_INVALID; +	if ((pmd_val(pmd) & mask) != 0)  		return 0;  	VM_BUG_ON(!pfn_valid(pmd_val(pmd) >> PAGE_SHIFT)); diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c index 44a8e6f0391e..e804090f4470 100644 --- a/arch/s390/mm/hugetlbpage.c +++ b/arch/s390/mm/hugetlbpage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *  IBM System z Huge TLB Page Support for Kernel.   * diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 3b567838b905..41ba9bd53e48 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *  S390 version   *    Copyright IBM Corp. 1999 diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c index 792f9c63fbca..7be06475809b 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Access kernel memory without faulting -- s390 specific implementation.   * diff --git a/arch/s390/mm/mem_detect.c b/arch/s390/mm/mem_detect.c index e58dca05b962..21f6c82c8296 100644 --- a/arch/s390/mm/mem_detect.c +++ b/arch/s390/mm/mem_detect.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Copyright IBM Corp. 2008, 2009   * diff --git a/arch/s390/mm/page-states.c b/arch/s390/mm/page-states.c index 07fa7b8ae233..382153ff17e3 100644 --- a/arch/s390/mm/page-states.c +++ b/arch/s390/mm/page-states.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Copyright IBM Corp. 2008   * diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 552f898dfa74..c44171588d08 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   * Copyright IBM Corp. 2011   * Author(s): Jan Glauber <[email protected]> diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 05f1f27e6708..cc2faffa7d6e 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *  Page table allocation functions   * diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index c0af0d7b6e5f..f2ada0bc08e6 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0  /*   *    Copyright IBM Corp. 2006   *    Author(s): Heiko Carstens <[email protected]> |