Merge branch 'sched/rt' into sched/core, to pick up completed topic tree (313f16e2) · Commits · 戴 / test

include/linux/kernel.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -257,6 +257,13 @@ extern void __cant_sleep(const char *file, int line, int preempt_offset);

	#define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)		#define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)

			#ifndef CONFIG_PREEMPT_RT
			# define cant_migrate() cant_sleep()
			#else
			/* Placeholder for now */
			# define cant_migrate() do { } while (0)
			#endif

	/**		/**
	* abs - return absolute value of an argument		* abs - return absolute value of an argument
	* @x: the value. If it is unsigned type, it is converted to signed type first.		* @x: the value. If it is unsigned type, it is converted to signed type first.

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -322,4 +322,34 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,

	#endif		#endif

			/**
			* migrate_disable - Prevent migration of the current task
			*
			* Maps to preempt_disable() which also disables preemption. Use
			* migrate_disable() to annotate that the intent is to prevent migration,
			* but not necessarily preemption.
			*
			* Can be invoked nested like preempt_disable() and needs the corresponding
			* number of migrate_enable() invocations.
			*/
			static __always_inline void migrate_disable(void)
			{
			preempt_disable();
			}

			/**
			* migrate_enable - Allow migration of the current task
			*
			* Counterpart to migrate_disable().
			*
			* As migrate_disable() can be invoked nested, only the outermost invocation
			* reenables migration.
			*
			* Currently mapped to preempt_enable().
			*/
			static __always_inline void migrate_enable(void)
			{
			preempt_enable();
			}

	#endif /* __LINUX_PREEMPT_H */		#endif /* __LINUX_PREEMPT_H */