Commit 1dcba20d authored by Shaokun Zhang's avatar Shaokun Zhang Committed by Zheng Zengkai
Browse files

sched: Make cookie functions static 

mainline inclusion
from mainline-v5.16-rc1
commit d07b2eee
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5OOWG
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d07b2eee4501c393cbf5bfcad36143310cfd72f9



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

Make cookie functions static as these are no longer invoked directly
by other code.

No functional change intended.

Signed-off-by: default avatarShaokun Zhang <zhangshaokun@hisilicon.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210922085735.52812-1-zhangshaokun@hisilicon.com


Signed-off-by: default avatarLin Shengwang <linshengwang1@huawei.com>
Reviewed-by: default avatarlihua <hucool.lihua@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent d7151843

kernel/sched/core_sched.c

+5 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct sched_core_cookie { 
	refcount_t refcnt;

};



unsigned long sched_core_alloc_cookie(void)

static unsigned long sched_core_alloc_cookie(void)

{

	struct sched_core_cookie *ck = kmalloc(sizeof(*ck), GFP_KERNEL);

	if (!ck)
@@ -23,7 +23,7 @@ unsigned long sched_core_alloc_cookie(void) 
	return (unsigned long)ck;

}



void sched_core_put_cookie(unsigned long cookie)

static void sched_core_put_cookie(unsigned long cookie)

{

	struct sched_core_cookie *ptr = (void *)cookie;
@@ -33,7 +33,7 @@ void sched_core_put_cookie(unsigned long cookie) 
	}

}



unsigned long sched_core_get_cookie(unsigned long cookie)

static unsigned long sched_core_get_cookie(unsigned long cookie)

{

	struct sched_core_cookie *ptr = (void *)cookie;
@@ -53,7 +53,8 @@ unsigned long sched_core_get_cookie(unsigned long cookie) 
 *

 * Returns: the old cookie

 */

unsigned long sched_core_update_cookie(struct task_struct *p, unsigned long cookie)

static unsigned long sched_core_update_cookie(struct task_struct *p,

					      unsigned long cookie)

{

	unsigned long old_cookie;

	struct rq_flags rf;

kernel/sched/sched.h

+0 −5
Original line number Diff line number Diff line
@@ -1278,11 +1278,6 @@ extern void sched_core_dequeue(struct rq *rq, struct task_struct *p); 
extern void sched_core_get(void);

extern void sched_core_put(void);



extern unsigned long sched_core_alloc_cookie(void);

extern void sched_core_put_cookie(unsigned long cookie);

extern unsigned long sched_core_get_cookie(unsigned long cookie);

extern unsigned long sched_core_update_cookie(struct task_struct *p, unsigned long cookie);



#else /* !CONFIG_SCHED_CORE */



static inline bool sched_core_enabled(struct rq *rq)