diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 12:30:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 12:30:18 +0300 |
| commit | 15bcdc9477b03eb035052412c3a087e11e855e76 (patch) | |
| tree | e1e3c1f2b89e3a705d1737d61a4d8a9394a1930e /arch/m32r/lib | |
| parent | 340b5319c98eb14f7a70947a38e17d06f5beea88 (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
| download | linux-15bcdc9477b03eb035052412c3a087e11e855e76.tar.xz | |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
tools/perf/arch/arm/annotate/instructions.c
tools/perf/arch/arm64/annotate/instructions.c
tools/perf/arch/powerpc/annotate/instructions.c
tools/perf/arch/s390/annotate/instructions.c
tools/perf/arch/x86/tests/intel-cqm.c
tools/perf/ui/tui/progress.c
tools/perf/util/zlib.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/lib')
| -rw-r--r-- | arch/m32r/lib/ashxdi3.S | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/delay.c | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/libgcc.h | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/memcpy.S | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/memset.S | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/strlen.S | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/ucmpdi2.c | 1 | ||||
| -rw-r--r-- | arch/m32r/lib/usercopy.c | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/arch/m32r/lib/ashxdi3.S b/arch/m32r/lib/ashxdi3.S index 7fc0c19801ba..cd1acca53911 100644 --- a/arch/m32r/lib/ashxdi3.S +++ b/arch/m32r/lib/ashxdi3.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/lib/ashxdi3.S * diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c index 940f4837e42b..ae1fe90892f9 100644 --- a/arch/m32r/lib/delay.c +++ b/arch/m32r/lib/delay.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/lib/delay.c * diff --git a/arch/m32r/lib/libgcc.h b/arch/m32r/lib/libgcc.h index 267aa435bc35..4854690d944a 100644 --- a/arch/m32r/lib/libgcc.h +++ b/arch/m32r/lib/libgcc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_LIBGCC_H #define __ASM_LIBGCC_H diff --git a/arch/m32r/lib/memcpy.S b/arch/m32r/lib/memcpy.S index 05987cd639ef..249da3e3358d 100644 --- a/arch/m32r/lib/memcpy.S +++ b/arch/m32r/lib/memcpy.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/lib/memcpy.S * diff --git a/arch/m32r/lib/memset.S b/arch/m32r/lib/memset.S index 2b2831a37927..e7f45e6c73f5 100644 --- a/arch/m32r/lib/memset.S +++ b/arch/m32r/lib/memset.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/lib/memset.S * diff --git a/arch/m32r/lib/strlen.S b/arch/m32r/lib/strlen.S index 916de9e8f801..41c77e387593 100644 --- a/arch/m32r/lib/strlen.S +++ b/arch/m32r/lib/strlen.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/strlen.S -- strlen code. * diff --git a/arch/m32r/lib/ucmpdi2.c b/arch/m32r/lib/ucmpdi2.c index 9d3c682c89b5..e20fa3484fd8 100644 --- a/arch/m32r/lib/ucmpdi2.c +++ b/arch/m32r/lib/ucmpdi2.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "libgcc.h" int __ucmpdi2(unsigned long long a, unsigned long long b) diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index b723b11107c7..0892a4341b3a 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * User address space access functions. * The non inlined parts of asm-m32r/uaccess.h are here. |