diff --git a/[refs] b/[refs] index 45b4ae6a9a77..bd1e859d257d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39b0fad7121eace85770e7a4c6dc35dfd2879768 +refs/heads/master: 1b427c153a08fdbc092c2bdbf845b92fda58d857 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 1941d8b5cf11..26da921530fe 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -824,7 +824,16 @@ extern void partition_sched_domains(int ndoms_new, cpumask_t *doms_new, struct sched_domain_attr *dattr_new); extern int arch_reinit_sched_domains(void); -#endif /* CONFIG_SMP */ +#else /* CONFIG_SMP */ + +struct sched_domain_attr; + +static inline void +partition_sched_domains(int ndoms_new, cpumask_t *doms_new, + struct sched_domain_attr *dattr_new) +{ +} +#endif /* !CONFIG_SMP */ struct io_context; /* See blkdev.h */ #define NGROUPS_SMALL 32