Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1261694

[PATCH v10 2/5] missing include in cputime.c, remove #ifdef CONFIG_PARAVIRT from sched/core.c

Show all headers | View raw

ifdef CONFIG_PARAVIRT in sched/core.c is redundant, as asm/paravirt.h
is already protected by #ifdef CONFIG_PARAVIRT.

Add include asm/paravirt.h to cputime.c, as steal_account_process_tick
calls paravirt_steal_clock, which is defined in paravirt.h.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: mingo@redhat.com
CC: peterz@infradead.org
---
 kernel/sched/core.c    |    2 --
 kernel/sched/cputime.c |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index bcd214e..395fad9 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -79,9 +79,7 @@
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
 #include <asm/mutex.h>
-#ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
-#endif
 
 #include "sched.h"
 #include "../workqueue_internal.h"
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index 8cbc3db..a1426fa 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -5,6 +5,7 @@
 #include <linux/static_key.h>
 #include <linux/context_tracking.h>
 #include "sched.h"
+#include <asm/paravirt.h>
 
 
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v10 0/5] xen/arm/arm64: CONFIG_PARAVIRT and stolen ticks  accounting Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:20 +0100
  [PATCH v10 4/5] arm64: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:30 +0100
  [PATCH v10 2/5] missing include in cputime.c, remove #ifdef CONFIG_PARAVIRT from sched/core.c Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:30 +0100
    Re: [PATCH v10 2/5] missing include in cputime.c, remove #ifdef  CONFIG_PARAVIRT from sched/core.c kbuild test robot <lkp@intel.com> - 2015-11-03 18:20 +0100
      Re: [PATCH v10 2/5] missing include in cputime.c, remove #ifdef  CONFIG_PARAVIRT from sched/core.c Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 19:00 +0100
    Re: [PATCH v10 2/5] missing include in cputime.c, remove #ifdef  CONFIG_PARAVIRT from sched/core.c kbuild test robot <lkp@intel.com> - 2015-11-03 19:30 +0100
  [PATCH v10 5/5] xen/arm: account for stolen ticks Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:30 +0100
  [PATCH v10 3/5] arm: introduce CONFIG_PARAVIRT, PARAVIRT_TIME_ACCOUNTING and pv_time_ops Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:30 +0100
  [PATCH v10 1/5] xen: move xen_setup_runstate_info and get_runstate_snapshot to drivers/xen/time.c Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2015-11-03 17:30 +0100

csiph-web