diff --git a/[refs] b/[refs] index dbf218014ec6..c058f24fb2a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c910d289567163dbe40ccc174b36afd1c7723bd +refs/heads/master: db2f59c8c9b315f2b88b1dac159b988c6009034d diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 973f97362ceb..2e3545f57e77 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6957,7 +6957,7 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd) spin_unlock_irqrestore(&rq->lock, flags); } -static int init_rootdomain(struct root_domain *rd, bool bootmem) +static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem) { memset(rd, 0, sizeof(*rd)); diff --git a/trunk/kernel/sched_cpupri.c b/trunk/kernel/sched_cpupri.c index 018b7be1db2e..1e00bfacf9b8 100644 --- a/trunk/kernel/sched_cpupri.c +++ b/trunk/kernel/sched_cpupri.c @@ -151,7 +151,7 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) * * Returns: -ENOMEM if memory fails. */ -int cpupri_init(struct cpupri *cp, bool bootmem) +int __init_refok cpupri_init(struct cpupri *cp, bool bootmem) { int i;