diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:21:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:21:08 +0100 |
| commit | b5cd3b51e247473e290be5cd09e77171e466cd89 (patch) | |
| tree | ac8c87e1b38f61a4c879c574dc9373db41f3df01 /arch/sh/mm | |
| parent | 376f3bcebdc999cc737d9052109cc33b573b3a8b (diff) | |
| parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff) | |
| download | linux-b5cd3b51e247473e290be5cd09e77171e466cd89.tar.bz2 | |
Merge branch 'linus' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/mm')
| -rw-r--r-- | arch/sh/mm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/mm/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/mm/extable_32.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/flush-sh4.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/gup.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/hugetlbpage.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/ioremap_fixed.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/pgtable.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/uncached.c | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index dba285e86808..50cdd1349015 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 menu "Memory management options" config QUICKLIST diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile index 92c3bd96aee5..fbe5e79751b3 100644 --- a/arch/sh/mm/Makefile +++ b/arch/sh/mm/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux SuperH-specific parts of the memory manager. # diff --git a/arch/sh/mm/extable_32.c b/arch/sh/mm/extable_32.c index 940e871bc816..14312027bb08 100644 --- a/arch/sh/mm/extable_32.c +++ b/arch/sh/mm/extable_32.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/sh/mm/extable.c * Taken from: diff --git a/arch/sh/mm/flush-sh4.c b/arch/sh/mm/flush-sh4.c index 0b85dd9dd3a7..8b8ef8972104 100644 --- a/arch/sh/mm/flush-sh4.c +++ b/arch/sh/mm/flush-sh4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/mm.h> #include <asm/mmu_context.h> #include <asm/cache_insns.h> diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c index 063c298ba56c..8045b5bb7075 100644 --- a/arch/sh/mm/gup.c +++ b/arch/sh/mm/gup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Lockless get_user_pages_fast for SuperH * diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c index d2412d2d6462..960deb1f24a1 100644 --- a/arch/sh/mm/hugetlbpage.c +++ b/arch/sh/mm/hugetlbpage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/sh/mm/hugetlbpage.c * diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c index efbe84af9983..927a1294c465 100644 --- a/arch/sh/mm/ioremap_fixed.c +++ b/arch/sh/mm/ioremap_fixed.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Re-map IO memory to kernel address space so that we can access it. * diff --git a/arch/sh/mm/pgtable.c b/arch/sh/mm/pgtable.c index a62bd8696779..5c8f9247c3c2 100644 --- a/arch/sh/mm/pgtable.c +++ b/arch/sh/mm/pgtable.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/mm.h> #include <linux/slab.h> diff --git a/arch/sh/mm/uncached.c b/arch/sh/mm/uncached.c index a7767da815e9..010010bf205a 100644 --- a/arch/sh/mm/uncached.c +++ b/arch/sh/mm/uncached.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <linux/module.h> #include <asm/sizes.h> |