Commit cfa97f99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix section mismatch
  sched: fix double kfree in failure path
  sched: clean up arch_reinit_sched_domains()
  sched: mark sched_create_sysfs_power_savings_entries() as __init
  getrusage: RUSAGE_THREAD should return ru_utime and ru_stime
  sched: fix sched_slice()
  sched_clock: prevent scd->clock from moving backwards, take #2
  sched: sched.c declare variables before they get used
parents 7238eb4c db2f59c8

include/linux/sched.h

+3 −4
Original line number Diff line number Diff line
@@ -915,7 +915,6 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd) 


extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,

				    struct sched_domain_attr *dattr_new);

extern int arch_reinit_sched_domains(void);



/* Test a flag in parent sched domain */

static inline int test_sd_parent(struct sched_domain *sd, int flag)
@@ -1707,16 +1706,16 @@ extern void wake_up_idle_cpu(int cpu); 
static inline void wake_up_idle_cpu(int cpu) { }

#endif



#ifdef CONFIG_SCHED_DEBUG

extern unsigned int sysctl_sched_latency;

extern unsigned int sysctl_sched_min_granularity;

extern unsigned int sysctl_sched_wakeup_granularity;

extern unsigned int sysctl_sched_shares_ratelimit;

extern unsigned int sysctl_sched_shares_thresh;

#ifdef CONFIG_SCHED_DEBUG

extern unsigned int sysctl_sched_child_runs_first;

extern unsigned int sysctl_sched_features;

extern unsigned int sysctl_sched_migration_cost;

extern unsigned int sysctl_sched_nr_migrate;

extern unsigned int sysctl_sched_shares_ratelimit;

extern unsigned int sysctl_sched_shares_thresh;



int sched_nr_latency_handler(struct ctl_table *table, int write,

		struct file *file, void __user *buffer, size_t *length,

include/linux/time.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ extern unsigned long read_persistent_clock(void); 
extern int update_persistent_clock(struct timespec now);

extern int no_sync_cmos_clock __read_mostly;

void timekeeping_init(void);

extern int timekeeping_suspended;



unsigned long get_seconds(void);

struct timespec current_kernel_time(void);

kernel/sched.c

+7 −11
Original line number Diff line number Diff line
@@ -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));
@@ -6970,7 +6970,7 @@ static int init_rootdomain(struct root_domain *rd, bool bootmem) 
	}



	if (!alloc_cpumask_var(&rd->span, GFP_KERNEL))

		goto free_rd;

		goto out;

	if (!alloc_cpumask_var(&rd->online, GFP_KERNEL))

		goto free_span;

	if (!alloc_cpumask_var(&rd->rto_mask, GFP_KERNEL))
@@ -6986,8 +6986,7 @@ free_online: 
	free_cpumask_var(rd->online);

free_span:

	free_cpumask_var(rd->span);

free_rd:

	kfree(rd);

out:

	return -ENOMEM;

}
@@ -7987,7 +7986,7 @@ match2: 
}



#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)

int arch_reinit_sched_domains(void)

static void arch_reinit_sched_domains(void)

{

	get_online_cpus();
@@ -7996,13 +7995,10 @@ int arch_reinit_sched_domains(void) 


	rebuild_sched_domains();

	put_online_cpus();



	return 0;

}



static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)

{

	int ret;

	unsigned int level = 0;



	if (sscanf(buf, "%u", &level) != 1)
@@ -8023,9 +8019,9 @@ static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) 
	else

		sched_mc_power_savings = level;



	ret = arch_reinit_sched_domains();

	arch_reinit_sched_domains();



	return ret ? ret : count;

	return count;

}



#ifdef CONFIG_SCHED_MC
@@ -8060,7 +8056,7 @@ static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644, 
		   sched_smt_power_savings_store);

#endif



int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)

int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)

{

	int err = 0;

kernel/sched_clock.c

+4 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) 


	clock = scd->tick_gtod + delta;

	min_clock = wrap_max(scd->tick_gtod, scd->clock);

	max_clock = scd->tick_gtod + TICK_NSEC;

	max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);



	clock = wrap_max(clock, min_clock);

	clock = wrap_min(clock, max_clock);
@@ -227,6 +227,9 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event); 
 */

void sched_clock_idle_wakeup_event(u64 delta_ns)

{

	if (timekeeping_suspended)

		return;



	sched_clock_tick();

	touch_softlockup_watchdog();

}

kernel/sched_cpupri.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE