Commit cf48b9e5 authored by Yu Liao's avatar Yu Liao Committed by Zheng Zengkai
Browse files

kabi: reserve space for time and workqueue subsystem related structure 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4GUAB


CVE: NA

-------------------------------

Reserve space for timer and workqueue subsystem.

Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
Reviewed-by: default avatarwangxiongfeng 00379786 <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent cdbf61a3

include/linux/timer.h

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef _LINUX_TIMER_H

#define _LINUX_TIMER_H



#include <linux/kabi.h>

#include <linux/list.h>

#include <linux/ktime.h>

#include <linux/stddef.h>
@@ -21,6 +22,11 @@ struct timer_list { 
#ifdef CONFIG_LOCKDEP

	struct lockdep_map	lockdep_map;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



#ifdef CONFIG_LOCKDEP

include/linux/workqueue.h

+11 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#ifndef _LINUX_WORKQUEUE_H

#define _LINUX_WORKQUEUE_H



#include <linux/kabi.h>

#include <linux/timer.h>

#include <linux/linkage.h>

#include <linux/bitops.h>
@@ -106,6 +107,11 @@ struct work_struct { 
#ifdef CONFIG_LOCKDEP

	struct lockdep_map lockdep_map;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



#define WORK_DATA_INIT()	ATOMIC_LONG_INIT((unsigned long)WORK_STRUCT_NO_POOL)
@@ -121,6 +127,11 @@ struct delayed_work { 
	int cpu;

	/* delayed_work private data, only used in pciehp now */

	unsigned long data;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct rcu_work {