Commit 87e9b9f1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / sleep: Make suspend-to-idle-specific code depend on CONFIG_SUSPEND 



Since idle_should_freeze() is defined to always return 'false'
for CONFIG_SUSPEND unset, all of the code depending on it in
cpuidle_idle_call() is not necessary in that case.

Make that code depend on CONFIG_SUSPEND too to avoid building it
when it is not going to be used.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 67176736

drivers/cpuidle/cpuidle.c

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static int find_deepest_state(struct cpuidle_driver *drv, 
	return ret;

}



#ifdef CONFIG_SUSPEND

/**

 * cpuidle_find_deepest_state - Find the deepest available idle state.

 * @drv: cpuidle driver for the given CPU.
@@ -145,6 +146,7 @@ int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev) 


	return index;

}

#endif /* CONFIG_SUSPEND */



/**

 * cpuidle_enter_state - enter the state and update stats

include/linux/cpuidle.h

+10 −6
Original line number Diff line number Diff line
@@ -151,10 +151,6 @@ extern void cpuidle_resume(void); 
extern int cpuidle_enable_device(struct cpuidle_device *dev);

extern void cpuidle_disable_device(struct cpuidle_device *dev);

extern int cpuidle_play_dead(void);

extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv,

				      struct cpuidle_device *dev);

extern int cpuidle_enter_freeze(struct cpuidle_driver *drv,

				struct cpuidle_device *dev);



extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);

#else
@@ -190,14 +186,22 @@ static inline int cpuidle_enable_device(struct cpuidle_device *dev) 
{return -ENODEV; }

static inline void cpuidle_disable_device(struct cpuidle_device *dev) { }

static inline int cpuidle_play_dead(void) {return -ENODEV; }

static inline struct cpuidle_driver *cpuidle_get_cpu_driver(

	struct cpuidle_device *dev) {return NULL; }

#endif



#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SUSPEND)

extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv,

				      struct cpuidle_device *dev);

extern int cpuidle_enter_freeze(struct cpuidle_driver *drv,

				struct cpuidle_device *dev);

#else

static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv,

					     struct cpuidle_device *dev)

{return -ENODEV; }

static inline int cpuidle_enter_freeze(struct cpuidle_driver *drv,

				       struct cpuidle_device *dev)

{return -ENODEV; }

static inline struct cpuidle_driver *cpuidle_get_cpu_driver(

	struct cpuidle_device *dev) {return NULL; }

#endif



#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED

include/linux/tick.h

+8 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 


#ifdef CONFIG_GENERIC_CLOCKEVENTS

extern void __init tick_init(void);

extern void tick_freeze(void);

extern void tick_unfreeze(void);

/* Should be core only, but ARM BL switcher requires it */

extern void tick_suspend_local(void);

/* Should be core only, but XEN resume magic and ARM BL switcher require it */
@@ -23,14 +21,20 @@ extern void tick_handover_do_timer(void); 
extern void tick_cleanup_dead_cpu(int cpu);

#else /* CONFIG_GENERIC_CLOCKEVENTS */

static inline void tick_init(void) { }

static inline void tick_freeze(void) { }

static inline void tick_unfreeze(void) { }

static inline void tick_suspend_local(void) { }

static inline void tick_resume_local(void) { }

static inline void tick_handover_do_timer(void) { }

static inline void tick_cleanup_dead_cpu(int cpu) { }

#endif /* !CONFIG_GENERIC_CLOCKEVENTS */



#if defined(CONFIG_GENERIC_CLOCKEVENTS) && defined(CONFIG_SUSPEND)

extern void tick_freeze(void);

extern void tick_unfreeze(void);

#else

static inline void tick_freeze(void) { }

static inline void tick_unfreeze(void) { }

#endif



#ifdef CONFIG_TICK_ONESHOT

extern void tick_irq_enter(void);

#  ifndef arch_needs_cpu

kernel/time/tick-common.c

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void tick_resume(void) 
	tick_resume_local();

}



#ifdef CONFIG_SUSPEND

static DEFINE_RAW_SPINLOCK(tick_freeze_lock);

static unsigned int tick_freeze_depth;
@@ -494,6 +495,7 @@ void tick_unfreeze(void) 


	raw_spin_unlock(&tick_freeze_lock);

}

#endif /* CONFIG_SUSPEND */



/**

 * tick_init - initialize the tick control

CRA Git | Maintained and supported by SUSTech CRA and CCSE