* [GIT PULL] timers updates for 3.15
@ 2014-03-12 2:09 Frederic Weisbecker
2014-03-12 2:09 ` Frederic Weisbecker
2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker
0 siblings, 2 replies; 10+ messages in thread
From: Frederic Weisbecker @ 2014-03-12 2:09 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner
Cc: LKML, Frederic Weisbecker, Archs, Marcelo Tosatti, Peter Zijlstra,
Rik van Riel, Huiqingding
Ingo, Thomas,
Please pull the timers/cputime-fix-steal-v2 branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
timers/cputime-fix-steal-v2
It's based on tip:timers/core. The patches are essentially unchanged
since the last version (https://lkml.org/lkml/2014/3/6/376). I only
added a small comment in 4/6 and acks from Rik.
---
The main purpose of this set is to fix a bug on full dynticks configs
where steal time accounting appears to be zero in /proc/stat even
after a few seconds of competing guests running busy loops in a same
host CPU. It's not a regression though as it was there since the
beginning with full dynticks.
So patch [4/6] ("cputime: Fix jiffies based cputime assumption on
steal accounting") is the most important patch of the series. The rest
is mostly preparatory work to fix the bug plus various cleanups.
Thanks,
Frederic
---
Frederic Weisbecker (6):
cputime: Fix nsecs_to_cputime() return type cast
cputime: Default implementation of nsecs -> cputime conversion
cputime: Bring cputime -> nsecs conversion
cputime: Fix jiffies based cputime assumption on steal accounting
sched: Remove needless round trip nsecs <-> tick conversion of steal time
arch: Remove stub cputime.h headers
arch/alpha/include/asm/Kbuild | 1 +
arch/alpha/include/asm/cputime.h | 6 ------
arch/cris/include/asm/Kbuild | 1 +
arch/cris/include/asm/cputime.h | 6 ------
arch/frv/include/asm/Kbuild | 1 +
arch/frv/include/asm/cputime.h | 6 ------
arch/m32r/include/asm/Kbuild | 1 +
arch/m32r/include/asm/cputime.h | 6 ------
arch/microblaze/include/asm/Kbuild | 1 +
arch/microblaze/include/asm/cputime.h | 1 -
arch/mn10300/include/asm/Kbuild | 1 +
arch/mn10300/include/asm/cputime.h | 1 -
arch/score/include/asm/Kbuild | 2 +-
arch/score/include/asm/cputime.h | 6 ------
arch/x86/include/asm/Kbuild | 1 +
arch/x86/include/asm/cputime.h | 1 -
drivers/cpufreq/cpufreq_stats.c | 2 +-
drivers/s390/cio/cio.c | 2 +-
fs/proc/stat.c | 2 +-
fs/proc/uptime.c | 2 +-
include/asm-generic/cputime_jiffies.h | 4 +++-
include/asm-generic/cputime_nsecs.h | 5 ++++-
include/linux/cputime.h | 16 ++++++++++++++++
include/linux/kernel_stat.h | 2 +-
include/linux/sched.h | 2 +-
kernel/sched/core.c | 6 ------
kernel/sched/cputime.c | 16 +++++++++++-----
kernel/sched/sched.h | 10 ----------
28 files changed, 48 insertions(+), 63 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL] timers updates for 3.15 2014-03-12 2:09 [GIT PULL] timers updates for 3.15 Frederic Weisbecker @ 2014-03-12 2:09 ` Frederic Weisbecker 2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker 1 sibling, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 2:09 UTC (permalink / raw) To: Ingo Molnar, Thomas Gleixner Cc: LKML, Frederic Weisbecker, Archs, Marcelo Tosatti, Peter Zijlstra, Rik van Riel, Huiqingding Ingo, Thomas, Please pull the timers/cputime-fix-steal-v2 branch that can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git timers/cputime-fix-steal-v2 It's based on tip:timers/core. The patches are essentially unchanged since the last version (https://lkml.org/lkml/2014/3/6/376). I only added a small comment in 4/6 and acks from Rik. --- The main purpose of this set is to fix a bug on full dynticks configs where steal time accounting appears to be zero in /proc/stat even after a few seconds of competing guests running busy loops in a same host CPU. It's not a regression though as it was there since the beginning with full dynticks. So patch [4/6] ("cputime: Fix jiffies based cputime assumption on steal accounting") is the most important patch of the series. The rest is mostly preparatory work to fix the bug plus various cleanups. Thanks, Frederic --- Frederic Weisbecker (6): cputime: Fix nsecs_to_cputime() return type cast cputime: Default implementation of nsecs -> cputime conversion cputime: Bring cputime -> nsecs conversion cputime: Fix jiffies based cputime assumption on steal accounting sched: Remove needless round trip nsecs <-> tick conversion of steal time arch: Remove stub cputime.h headers arch/alpha/include/asm/Kbuild | 1 + arch/alpha/include/asm/cputime.h | 6 ------ arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/cputime.h | 6 ------ arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/cputime.h | 6 ------ arch/m32r/include/asm/Kbuild | 1 + arch/m32r/include/asm/cputime.h | 6 ------ arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/cputime.h | 1 - arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/cputime.h | 1 - arch/score/include/asm/Kbuild | 2 +- arch/score/include/asm/cputime.h | 6 ------ arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/cputime.h | 1 - drivers/cpufreq/cpufreq_stats.c | 2 +- drivers/s390/cio/cio.c | 2 +- fs/proc/stat.c | 2 +- fs/proc/uptime.c | 2 +- include/asm-generic/cputime_jiffies.h | 4 +++- include/asm-generic/cputime_nsecs.h | 5 ++++- include/linux/cputime.h | 16 ++++++++++++++++ include/linux/kernel_stat.h | 2 +- include/linux/sched.h | 2 +- kernel/sched/core.c | 6 ------ kernel/sched/cputime.c | 16 +++++++++++----- kernel/sched/sched.h | 10 ---------- 28 files changed, 48 insertions(+), 63 deletions(-) ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 2:09 [GIT PULL] timers updates for 3.15 Frederic Weisbecker 2014-03-12 2:09 ` Frederic Weisbecker @ 2014-03-12 2:10 ` Frederic Weisbecker 2014-03-12 2:10 ` Frederic Weisbecker 2014-03-12 9:44 ` Peter Zijlstra 1 sibling, 2 replies; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 2:10 UTC (permalink / raw) To: Ingo Molnar, Thomas Gleixner Cc: LKML, Frederic Weisbecker, Archs, Marcelo Tosatti, Peter Zijlstra Many architectures have a stub cputime.h that only include the default cputime.h Lets remove the useless headers, we only need to mention that we want the default headers on the Kbuild files. Cc: Archs <linux-arch@vger.kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> --- arch/alpha/include/asm/Kbuild | 1 + arch/alpha/include/asm/cputime.h | 6 ------ arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/cputime.h | 6 ------ arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/cputime.h | 6 ------ arch/m32r/include/asm/Kbuild | 1 + arch/m32r/include/asm/cputime.h | 6 ------ arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/cputime.h | 1 - arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/cputime.h | 1 - arch/score/include/asm/Kbuild | 2 +- arch/score/include/asm/cputime.h | 6 ------ arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/cputime.h | 1 - 16 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 arch/alpha/include/asm/cputime.h delete mode 100644 arch/cris/include/asm/cputime.h delete mode 100644 arch/frv/include/asm/cputime.h delete mode 100644 arch/m32r/include/asm/cputime.h delete mode 100644 arch/microblaze/include/asm/cputime.h delete mode 100644 arch/mn10300/include/asm/cputime.h delete mode 100644 arch/score/include/asm/cputime.h delete mode 100644 arch/x86/include/asm/cputime.h diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index a73a8e2..1a81a8b 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += exec.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h deleted file mode 100644 index 19577fd..0000000 --- a/arch/alpha/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ALPHA_CPUTIME_H -#define __ALPHA_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __ALPHA_CPUTIME_H */ diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index f3fd876..9d02b45 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -14,3 +14,4 @@ generic-y += trace_clock.h generic-y += vga.h generic-y += xor.h generic-y += preempt.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65..0000000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CRIS_CPUTIME_H -#define __CRIS_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __CRIS_CPUTIME_H */ diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index bc42f14..c5eca98 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -4,3 +4,4 @@ generic-y += exec.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h diff --git a/arch/frv/include/asm/cputime.h b/arch/frv/include/asm/cputime.h deleted file mode 100644 index f6c373a..0000000 --- a/arch/frv/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_CPUTIME_H -#define _ASM_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_CPUTIME_H */ diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index 932435a..fda061d 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += module.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/m32r/include/asm/cputime.h b/arch/m32r/include/asm/cputime.h deleted file mode 100644 index 0a47550..0000000 --- a/arch/m32r/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M32R_CPUTIME_H -#define __M32R_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __M32R_CPUTIME_H */ diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index 2b98bc7..da88738a 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@ -6,3 +6,4 @@ generic-y += hash.h generic-y += trace_clock.h generic-y += syscalls.h generic-y += preempt.h +generic-y += cputime.h diff --git a/arch/microblaze/include/asm/cputime.h b/arch/microblaze/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/microblaze/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index 992e989..e076269 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += exec.h generic-y += hash.h generic-y += trace_clock.h generic-y += preempt.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/mn10300/include/asm/cputime.h b/arch/mn10300/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/mn10300/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 146b9d5..1274e7a 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -7,4 +7,4 @@ generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h - +generic-y += cputime.h diff --git a/arch/score/include/asm/cputime.h b/arch/score/include/asm/cputime.h deleted file mode 100644 index 1fced99..0000000 --- a/arch/score/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_CPUTIME_H -#define _ASM_SCORE_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_SCORE_CPUTIME_H */ diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 7f66985..875f34e 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -5,3 +5,4 @@ genhdr-y += unistd_64.h genhdr-y += unistd_x32.h generic-y += clkdev.h +generic-y += cputime.h diff --git a/arch/x86/include/asm/cputime.h b/arch/x86/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/x86/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker @ 2014-03-12 2:10 ` Frederic Weisbecker 2014-03-12 9:44 ` Peter Zijlstra 1 sibling, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 2:10 UTC (permalink / raw) To: Ingo Molnar, Thomas Gleixner Cc: LKML, Frederic Weisbecker, Archs, Marcelo Tosatti, Peter Zijlstra Many architectures have a stub cputime.h that only include the default cputime.h Lets remove the useless headers, we only need to mention that we want the default headers on the Kbuild files. Cc: Archs <linux-arch@vger.kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> --- arch/alpha/include/asm/Kbuild | 1 + arch/alpha/include/asm/cputime.h | 6 ------ arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/cputime.h | 6 ------ arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/cputime.h | 6 ------ arch/m32r/include/asm/Kbuild | 1 + arch/m32r/include/asm/cputime.h | 6 ------ arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/cputime.h | 1 - arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/cputime.h | 1 - arch/score/include/asm/Kbuild | 2 +- arch/score/include/asm/cputime.h | 6 ------ arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/cputime.h | 1 - 16 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 arch/alpha/include/asm/cputime.h delete mode 100644 arch/cris/include/asm/cputime.h delete mode 100644 arch/frv/include/asm/cputime.h delete mode 100644 arch/m32r/include/asm/cputime.h delete mode 100644 arch/microblaze/include/asm/cputime.h delete mode 100644 arch/mn10300/include/asm/cputime.h delete mode 100644 arch/score/include/asm/cputime.h delete mode 100644 arch/x86/include/asm/cputime.h diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index a73a8e2..1a81a8b 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += exec.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h deleted file mode 100644 index 19577fd..0000000 --- a/arch/alpha/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ALPHA_CPUTIME_H -#define __ALPHA_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __ALPHA_CPUTIME_H */ diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index f3fd876..9d02b45 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -14,3 +14,4 @@ generic-y += trace_clock.h generic-y += vga.h generic-y += xor.h generic-y += preempt.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65..0000000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CRIS_CPUTIME_H -#define __CRIS_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __CRIS_CPUTIME_H */ diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index bc42f14..c5eca98 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -4,3 +4,4 @@ generic-y += exec.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h diff --git a/arch/frv/include/asm/cputime.h b/arch/frv/include/asm/cputime.h deleted file mode 100644 index f6c373a..0000000 --- a/arch/frv/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_CPUTIME_H -#define _ASM_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_CPUTIME_H */ diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index 932435a..fda061d 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += module.h generic-y += trace_clock.h generic-y += preempt.h generic-y += hash.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/m32r/include/asm/cputime.h b/arch/m32r/include/asm/cputime.h deleted file mode 100644 index 0a47550..0000000 --- a/arch/m32r/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M32R_CPUTIME_H -#define __M32R_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __M32R_CPUTIME_H */ diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index 2b98bc7..da88738a 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@ -6,3 +6,4 @@ generic-y += hash.h generic-y += trace_clock.h generic-y += syscalls.h generic-y += preempt.h +generic-y += cputime.h diff --git a/arch/microblaze/include/asm/cputime.h b/arch/microblaze/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/microblaze/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index 992e989..e076269 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -5,3 +5,4 @@ generic-y += exec.h generic-y += hash.h generic-y += trace_clock.h generic-y += preempt.h +generic-y += cputime.h \ No newline at end of file diff --git a/arch/mn10300/include/asm/cputime.h b/arch/mn10300/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/mn10300/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 146b9d5..1274e7a 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -7,4 +7,4 @@ generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h - +generic-y += cputime.h diff --git a/arch/score/include/asm/cputime.h b/arch/score/include/asm/cputime.h deleted file mode 100644 index 1fced99..0000000 --- a/arch/score/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_CPUTIME_H -#define _ASM_SCORE_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_SCORE_CPUTIME_H */ diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 7f66985..875f34e 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -5,3 +5,4 @@ genhdr-y += unistd_64.h genhdr-y += unistd_x32.h generic-y += clkdev.h +generic-y += cputime.h diff --git a/arch/x86/include/asm/cputime.h b/arch/x86/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/x86/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker 2014-03-12 2:10 ` Frederic Weisbecker @ 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 9:44 ` Peter Zijlstra ` (2 more replies) 1 sibling, 3 replies; 10+ messages in thread From: Peter Zijlstra @ 2014-03-12 9:44 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, Thomas Gleixner, LKML, Archs, Marcelo Tosatti On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote: > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild > index a73a8e2..1a81a8b 100644 > --- a/arch/alpha/include/asm/Kbuild > +++ b/arch/alpha/include/asm/Kbuild > @@ -5,3 +5,4 @@ generic-y += exec.h > generic-y += trace_clock.h > generic-y += preempt.h > generic-y += hash.h > +generic-y += cputime.h > \ No newline at end of file That's a double fail there, not sorted and no EOL. Please run the script from commit: b119fa61d440f after you touch the asm/Kbuild files. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 9:44 ` Peter Zijlstra @ 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 15:23 ` Frederic Weisbecker 2014-03-12 16:23 ` [PATCH v2] " Frederic Weisbecker 2 siblings, 0 replies; 10+ messages in thread From: Peter Zijlstra @ 2014-03-12 9:44 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, Thomas Gleixner, LKML, Archs, Marcelo Tosatti On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote: > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild > index a73a8e2..1a81a8b 100644 > --- a/arch/alpha/include/asm/Kbuild > +++ b/arch/alpha/include/asm/Kbuild > @@ -5,3 +5,4 @@ generic-y += exec.h > generic-y += trace_clock.h > generic-y += preempt.h > generic-y += hash.h > +generic-y += cputime.h > \ No newline at end of file That's a double fail there, not sorted and no EOL. Please run the script from commit: b119fa61d440f after you touch the asm/Kbuild files. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 9:44 ` Peter Zijlstra @ 2014-03-12 15:23 ` Frederic Weisbecker 2014-03-12 15:26 ` Peter Zijlstra 2014-03-12 16:23 ` [PATCH v2] " Frederic Weisbecker 2 siblings, 1 reply; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 15:23 UTC (permalink / raw) To: Peter Zijlstra; +Cc: Ingo Molnar, Thomas Gleixner, LKML, Archs, Marcelo Tosatti On Wed, Mar 12, 2014 at 10:44:47AM +0100, Peter Zijlstra wrote: > On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote: > > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild > > index a73a8e2..1a81a8b 100644 > > --- a/arch/alpha/include/asm/Kbuild > > +++ b/arch/alpha/include/asm/Kbuild > > @@ -5,3 +5,4 @@ generic-y += exec.h > > generic-y += trace_clock.h > > generic-y += preempt.h > > generic-y += hash.h > > +generic-y += cputime.h > > \ No newline at end of file > > That's a double fail there, not sorted and no EOL. > > Please run the script from commit: b119fa61d440f after you touch the > asm/Kbuild files. I don't see why we need to sort them. But I'm running the script anyway. Will resend, thanks. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 15:23 ` Frederic Weisbecker @ 2014-03-12 15:26 ` Peter Zijlstra 2014-03-12 15:47 ` Frederic Weisbecker 0 siblings, 1 reply; 10+ messages in thread From: Peter Zijlstra @ 2014-03-12 15:26 UTC (permalink / raw) To: Frederic Weisbecker Cc: Ingo Molnar, Thomas Gleixner, LKML, Archs, Marcelo Tosatti On Wed, Mar 12, 2014 at 04:23:28PM +0100, Frederic Weisbecker wrote: > On Wed, Mar 12, 2014 at 10:44:47AM +0100, Peter Zijlstra wrote: > > On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote: > > > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild > > > index a73a8e2..1a81a8b 100644 > > > --- a/arch/alpha/include/asm/Kbuild > > > +++ b/arch/alpha/include/asm/Kbuild > > > @@ -5,3 +5,4 @@ generic-y += exec.h > > > generic-y += trace_clock.h > > > generic-y += preempt.h > > > generic-y += hash.h > > > +generic-y += cputime.h > > > \ No newline at end of file > > > > That's a double fail there, not sorted and no EOL. > > > > Please run the script from commit: b119fa61d440f after you touch the > > asm/Kbuild files. > > I don't see why we need to sort them. But I'm running the script anyway. > Will resend, thanks. sfr gets real grumpy if we don't, at one point I gave in and wrote that script, because I sure as hell wasn't going to manually sort all those files every time I did a automated addition. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] arch: Remove stub cputime.h headers 2014-03-12 15:26 ` Peter Zijlstra @ 2014-03-12 15:47 ` Frederic Weisbecker 0 siblings, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 15:47 UTC (permalink / raw) To: Peter Zijlstra; +Cc: Ingo Molnar, Thomas Gleixner, LKML, Archs, Marcelo Tosatti On Wed, Mar 12, 2014 at 04:26:44PM +0100, Peter Zijlstra wrote: > On Wed, Mar 12, 2014 at 04:23:28PM +0100, Frederic Weisbecker wrote: > > On Wed, Mar 12, 2014 at 10:44:47AM +0100, Peter Zijlstra wrote: > > > On Wed, Mar 12, 2014 at 03:10:02AM +0100, Frederic Weisbecker wrote: > > > > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild > > > > index a73a8e2..1a81a8b 100644 > > > > --- a/arch/alpha/include/asm/Kbuild > > > > +++ b/arch/alpha/include/asm/Kbuild > > > > @@ -5,3 +5,4 @@ generic-y += exec.h > > > > generic-y += trace_clock.h > > > > generic-y += preempt.h > > > > generic-y += hash.h > > > > +generic-y += cputime.h > > > > \ No newline at end of file > > > > > > That's a double fail there, not sorted and no EOL. > > > > > > Please run the script from commit: b119fa61d440f after you touch the > > > asm/Kbuild files. > > > > I don't see why we need to sort them. But I'm running the script anyway. > > Will resend, thanks. > > sfr gets real grumpy if we don't, at one point I gave in and wrote that > script, because I sure as hell wasn't going to manually sort all those > files every time I did a automated addition. I see, it's to avoid merge conflicts then. Granted. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] arch: Remove stub cputime.h headers 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 15:23 ` Frederic Weisbecker @ 2014-03-12 16:23 ` Frederic Weisbecker 2 siblings, 0 replies; 10+ messages in thread From: Frederic Weisbecker @ 2014-03-12 16:23 UTC (permalink / raw) To: Peter Zijlstra Cc: LKML, Frederic Weisbecker, Archs, Ingo Molnar, Marcelo Tosatti, Thomas Gleixner Many architectures have a stub cputime.h that only include the default cputime.h Lets remove the useless headers, we only need to mention that we want the default headers on the Kbuild files. While at it, resort alphabetically the entries in arch/*/include/asm/Kbuild for those that have been touched. For this we use the script in commit b119fa61d440f as suggested by Peter Zijlstra. Cc: Archs <linux-arch@vger.kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> --- arch/alpha/include/asm/Kbuild | 7 ++++--- arch/alpha/include/asm/cputime.h | 6 ------ arch/cris/include/asm/Kbuild | 3 ++- arch/cris/include/asm/cputime.h | 6 ------ arch/frv/include/asm/Kbuild | 5 +++-- arch/frv/include/asm/cputime.h | 6 ------ arch/m32r/include/asm/Kbuild | 5 +++-- arch/m32r/include/asm/cputime.h | 6 ------ arch/microblaze/include/asm/Kbuild | 5 +++-- arch/microblaze/include/asm/cputime.h | 1 - arch/mn10300/include/asm/Kbuild | 3 ++- arch/mn10300/include/asm/cputime.h | 1 - arch/score/include/asm/Kbuild | 4 ++-- arch/score/include/asm/cputime.h | 6 ------ arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/cputime.h | 1 - 16 files changed, 20 insertions(+), 46 deletions(-) delete mode 100644 arch/alpha/include/asm/cputime.h delete mode 100644 arch/cris/include/asm/cputime.h delete mode 100644 arch/frv/include/asm/cputime.h delete mode 100644 arch/m32r/include/asm/cputime.h delete mode 100644 arch/microblaze/include/asm/cputime.h delete mode 100644 arch/mn10300/include/asm/cputime.h delete mode 100644 arch/score/include/asm/cputime.h delete mode 100644 arch/x86/include/asm/cputime.h diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index a73a8e2..2d960be 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -1,7 +1,8 @@ -generic-y += clkdev.h +generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h -generic-y += trace_clock.h -generic-y += preempt.h generic-y += hash.h +generic-y += preempt.h +generic-y += trace_clock.h diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h deleted file mode 100644 index 19577fd..0000000 --- a/arch/alpha/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ALPHA_CPUTIME_H -#define __ALPHA_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __ALPHA_CPUTIME_H */ diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index f3fd876..197199e 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -5,12 +5,13 @@ header-y += arch-v32/ generic-y += barrier.h generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h generic-y += hash.h generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h +generic-y += preempt.h generic-y += trace_clock.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h deleted file mode 100644 index 4446a65..0000000 --- a/arch/cris/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __CRIS_CPUTIME_H -#define __CRIS_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __CRIS_CPUTIME_H */ diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index bc42f14..7b0940e 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild @@ -1,6 +1,7 @@ generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h -generic-y += trace_clock.h -generic-y += preempt.h generic-y += hash.h +generic-y += preempt.h +generic-y += trace_clock.h diff --git a/arch/frv/include/asm/cputime.h b/arch/frv/include/asm/cputime.h deleted file mode 100644 index f6c373a..0000000 --- a/arch/frv/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_CPUTIME_H -#define _ASM_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_CPUTIME_H */ diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index 932435a..a46ff18 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@ -1,7 +1,8 @@ generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h +generic-y += hash.h generic-y += module.h -generic-y += trace_clock.h generic-y += preempt.h -generic-y += hash.h +generic-y += trace_clock.h diff --git a/arch/m32r/include/asm/cputime.h b/arch/m32r/include/asm/cputime.h deleted file mode 100644 index 0a47550..0000000 --- a/arch/m32r/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M32R_CPUTIME_H -#define __M32R_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __M32R_CPUTIME_H */ diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index 2b98bc7..12c7194 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@ -1,8 +1,9 @@ generic-y += barrier.h generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h generic-y += hash.h -generic-y += trace_clock.h -generic-y += syscalls.h generic-y += preempt.h +generic-y += syscalls.h +generic-y += trace_clock.h diff --git a/arch/microblaze/include/asm/cputime.h b/arch/microblaze/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/microblaze/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild index 992e989..b25a7d5 100644 --- a/arch/mn10300/include/asm/Kbuild +++ b/arch/mn10300/include/asm/Kbuild @@ -1,7 +1,8 @@ generic-y += barrier.h generic-y += clkdev.h +generic-y += cputime.h generic-y += exec.h generic-y += hash.h -generic-y += trace_clock.h generic-y += preempt.h +generic-y += trace_clock.h diff --git a/arch/mn10300/include/asm/cputime.h b/arch/mn10300/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/mn10300/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 146b9d5..f1361618 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -3,8 +3,8 @@ header-y += generic-y += barrier.h generic-y += clkdev.h +generic-y += cputime.h generic-y += hash.h +generic-y += preempt.h generic-y += trace_clock.h generic-y += xor.h -generic-y += preempt.h - diff --git a/arch/score/include/asm/cputime.h b/arch/score/include/asm/cputime.h deleted file mode 100644 index 1fced99..0000000 --- a/arch/score/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_CPUTIME_H -#define _ASM_SCORE_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _ASM_SCORE_CPUTIME_H */ diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 7f66985..875f34e 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -5,3 +5,4 @@ genhdr-y += unistd_64.h genhdr-y += unistd_x32.h generic-y += clkdev.h +generic-y += cputime.h diff --git a/arch/x86/include/asm/cputime.h b/arch/x86/include/asm/cputime.h deleted file mode 100644 index 6d68ad7..0000000 --- a/arch/x86/include/asm/cputime.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/cputime.h> -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-03-12 16:23 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-12 2:09 [GIT PULL] timers updates for 3.15 Frederic Weisbecker 2014-03-12 2:09 ` Frederic Weisbecker 2014-03-12 2:10 ` [PATCH 6/6] arch: Remove stub cputime.h headers Frederic Weisbecker 2014-03-12 2:10 ` Frederic Weisbecker 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 9:44 ` Peter Zijlstra 2014-03-12 15:23 ` Frederic Weisbecker 2014-03-12 15:26 ` Peter Zijlstra 2014-03-12 15:47 ` Frederic Weisbecker 2014-03-12 16:23 ` [PATCH v2] " Frederic Weisbecker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).