Commit 467c890f authored by Boqun Feng's avatar Boqun Feng
Browse files

Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.03.04a',... 

Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.03.04a', 'misc.2025.03.04a', 'srcu.2025.02.05a' and 'torture.2025.02.05a'
parents 73298c7c 8d608f08 5a562b8b 3cec2745 6be43acb

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -5758,6 +5758,11 @@ 
	rcutorture.test_boost_duration= [KNL]

			Duration (s) of each individual boost test.



	rcutorture.test_boost_holdoff= [KNL]

			Holdoff time (s) from start of test to the start

			of RCU priority-boost testing.	Defaults to zero,

			that is, no holdoff.



	rcutorture.test_boost_interval= [KNL]

			Interval (s) between each boost test.

include/linux/printk.h

+6 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ void printk_legacy_allow_panic_sync(void); 
extern bool nbcon_device_try_acquire(struct console *con);

extern void nbcon_device_release(struct console *con);

void nbcon_atomic_flush_unsafe(void);

bool pr_flush(int timeout_ms, bool reset_on_progress);

#else

static inline __printf(1, 0)

int vprintk(const char *s, va_list args)
@@ -315,6 +316,11 @@ static inline void nbcon_atomic_flush_unsafe(void) 
{

}



static inline bool pr_flush(int timeout_ms, bool reset_on_progress)

{

	return true;

}



#endif



bool this_cpu_in_panic(void);

include/linux/rcupdate.h

+1 −7
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ static inline void __rcu_read_lock(void) 


static inline void __rcu_read_unlock(void)

{

	preempt_enable();

	if (IS_ENABLED(CONFIG_RCU_STRICT_GRACE_PERIOD))

		rcu_read_unlock_strict();

	preempt_enable();

}



static inline int rcu_preempt_depth(void)
@@ -121,12 +121,6 @@ void rcu_init(void); 
extern int rcu_scheduler_active;

void rcu_sched_clock_irq(int user);



#ifdef CONFIG_TASKS_RCU_GENERIC

void rcu_init_tasks_generic(void);

#else

static inline void rcu_init_tasks_generic(void) { }

#endif



#ifdef CONFIG_RCU_STALL_COMMON

void rcu_sysrq_start(void);

void rcu_sysrq_end(void);

include/linux/rcupdate_wait.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
struct rcu_synchronize {

	struct rcu_head head;

	struct completion completion;



	/* This is for debugging. */

	struct rcu_gp_oldstate oldstate;

};

void wakeme_after_rcu(struct rcu_head *head);

include/linux/rcutree.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ extern int rcu_scheduler_active; 
void rcu_end_inkernel_boot(void);

bool rcu_inkernel_boot_has_ended(void);

bool rcu_is_watching(void);

#ifndef CONFIG_PREEMPTION

#ifndef CONFIG_PREEMPT_RCU

void rcu_all_qs(void);

#endif