diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /tools/power/cpupower/utils/helpers | |
parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
download | op-kernel-dev-294cbd05e32990c3b1a62be27441fc719edebbab.zip op-kernel-dev-294cbd05e32990c3b1a62be27441fc719edebbab.tar.gz |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/power/cpupower/utils/helpers')
-rw-r--r-- | tools/power/cpupower/utils/helpers/amd.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/bitmask.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/bitmask.h | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/cpuid.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/misc.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/msr.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/pci.c | 1 | ||||
-rw-r--r-- | tools/power/cpupower/utils/helpers/sysfs.h | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c index 5fd5c5b..bb41cdd 100644 --- a/tools/power/cpupower/utils/helpers/amd.c +++ b/tools/power/cpupower/utils/helpers/amd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #if defined(__i386__) || defined(__x86_64__) #include <unistd.h> #include <errno.h> diff --git a/tools/power/cpupower/utils/helpers/bitmask.c b/tools/power/cpupower/utils/helpers/bitmask.c index 5c074c6..6c7932f 100644 --- a/tools/power/cpupower/utils/helpers/bitmask.c +++ b/tools/power/cpupower/utils/helpers/bitmask.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/tools/power/cpupower/utils/helpers/bitmask.h b/tools/power/cpupower/utils/helpers/bitmask.h index eb289df..b98d93a 100644 --- a/tools/power/cpupower/utils/helpers/bitmask.h +++ b/tools/power/cpupower/utils/helpers/bitmask.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __CPUPOWER_BITMASK__ #define __CPUPOWER_BITMASK__ diff --git a/tools/power/cpupower/utils/helpers/cpuid.c b/tools/power/cpupower/utils/helpers/cpuid.c index 32d37c9..732b0b4 100644 --- a/tools/power/cpupower/utils/helpers/cpuid.c +++ b/tools/power/cpupower/utils/helpers/cpuid.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> #include <errno.h> #include <string.h> diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c index a5e7ddf..80fdf55 100644 --- a/tools/power/cpupower/utils/helpers/misc.c +++ b/tools/power/cpupower/utils/helpers/misc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #if defined(__i386__) || defined(__x86_64__) #include "helpers/helpers.h" diff --git a/tools/power/cpupower/utils/helpers/msr.c b/tools/power/cpupower/utils/helpers/msr.c index 31a4b24..ab99507 100644 --- a/tools/power/cpupower/utils/helpers/msr.c +++ b/tools/power/cpupower/utils/helpers/msr.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #if defined(__i386__) || defined(__x86_64__) #include <fcntl.h> diff --git a/tools/power/cpupower/utils/helpers/pci.c b/tools/power/cpupower/utils/helpers/pci.c index 8b27898..113f3da 100644 --- a/tools/power/cpupower/utils/helpers/pci.c +++ b/tools/power/cpupower/utils/helpers/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #if defined(__i386__) || defined(__x86_64__) #include <helpers/helpers.h> diff --git a/tools/power/cpupower/utils/helpers/sysfs.h b/tools/power/cpupower/utils/helpers/sysfs.h index d28f11f..0f0b9ad 100644 --- a/tools/power/cpupower/utils/helpers/sysfs.h +++ b/tools/power/cpupower/utils/helpers/sysfs.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __CPUPOWER_HELPERS_SYSFS_H__ #define __CPUPOWER_HELPERS_SYSFS_H__ |