These structures are actually part of 'struct signal', so move them to 
<linux/sched/signal.h>
where they belong.

This further decreases the size and complexity of <linux/sched.h>.

Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 include/linux/sched.h        | 13 -------------
 include/linux/sched/signal.h | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index d3cf8bc4e903..c2345cf5feee 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -328,19 +328,6 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned 
long addr,
 static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
 #endif
 
-struct pacct_struct {
-       int                     ac_flag;
-       long                    ac_exitcode;
-       unsigned long           ac_mem;
-       u64                     ac_utime, ac_stime;
-       unsigned long           ac_minflt, ac_majflt;
-};
-
-struct cpu_itimer {
-       u64 expires;
-       u64 incr;
-};
-
 /**
  * struct prev_cputime - snaphsot of system and user cputime
  * @utime: time spent in user mode
diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
index 613d9f9b3fe5..c19a6216a785 100644
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -15,6 +15,22 @@ struct sighand_struct {
 };
 
 /*
+ * Per-process accounting stats:
+ */
+struct pacct_struct {
+       int                     ac_flag;
+       long                    ac_exitcode;
+       unsigned long           ac_mem;
+       u64                     ac_utime, ac_stime;
+       unsigned long           ac_minflt, ac_majflt;
+};
+
+struct cpu_itimer {
+       u64 expires;
+       u64 incr;
+};
+
+/*
  * NOTE! "signal_struct" does not have its own
  * locking, because a shared signal_struct always
  * implies a shared sighand_struct, so locking
-- 
2.7.4

Reply via email to