Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of... 

Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf events: Fix ring_buffer_wakeup() brown paperbag bug

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling
  MAINTAINERS: Update tip.git related git trees
parents a36bfddd 44b7f4b9 ab278921

MAINTAINERS

+9 −4
Original line number Diff line number Diff line
@@ -3101,6 +3101,7 @@ F: include/linux/hid* 


HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Maintained

F:	Documentation/timers/

F:	kernel/hrtimer.c
@@ -3610,7 +3611,7 @@ F: net/irda/ 
IRQ SUBSYSTEM

M:	Thomas Gleixner <tglx@linutronix.de>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	kernel/irq/



ISAPNP
@@ -4098,7 +4099,7 @@ F: drivers/hwmon/lm90.c 
LOCKDEP AND LOCKSTAT

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking

S:	Maintained

F:	Documentation/lockdep*.txt

F:	Documentation/lockstat.txt
@@ -5086,6 +5087,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl> 
M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core

S:	Supported

F:	kernel/events/*

F:	include/linux/perf_event.h
@@ -5165,6 +5167,7 @@ F: drivers/scsi/pm8001/ 


POSIX CLOCKS and TIMERS

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

F:	fs/timerfd.c

F:	include/linux/timer*
@@ -5680,6 +5683,7 @@ F: drivers/dma/dw_dmac.c 
TIMEKEEPING, NTP

M:	John Stultz <johnstul@us.ibm.com>

M:	Thomas Gleixner <tglx@linutronix.de>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core

S:	Supported

F:	include/linux/clocksource.h

F:	include/linux/time.h
@@ -5704,6 +5708,7 @@ F: drivers/watchdog/sc1200wdt.c 
SCHEDULER

M:	Ingo Molnar <mingo@elte.hu>

M:	Peter Zijlstra <peterz@infradead.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core

S:	Maintained

F:	kernel/sched*

F:	include/linux/sched.h
@@ -6631,7 +6636,7 @@ TRACING 
M:	Steven Rostedt <rostedt@goodmis.org>

M:	Frederic Weisbecker <fweisbec@gmail.com>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core

S:	Maintained

F:	Documentation/trace/ftrace.txt

F:	arch/*/*/*/ftrace.h
@@ -7381,7 +7386,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
M:	Ingo Molnar <mingo@redhat.com>

M:	"H. Peter Anvin" <hpa@zytor.com>

M:	x86@kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core

S:	Maintained

F:	Documentation/x86/

F:	arch/x86/

kernel/events/core.c

+6 −2
Original line number Diff line number Diff line
@@ -3558,9 +3558,13 @@ static void ring_buffer_wakeup(struct perf_event *event) 


	rcu_read_lock();

	rb = rcu_dereference(event->rb);

	list_for_each_entry_rcu(event, &rb->event_list, rb_entry) {

	if (!rb)

		goto unlock;



	list_for_each_entry_rcu(event, &rb->event_list, rb_entry)

		wake_up_all(&event->waitq);

	}



unlock:

	rcu_read_unlock();

}

kernel/sched_fair.c

+8 −6
Original line number Diff line number Diff line
@@ -2352,13 +2352,11 @@ static int select_idle_sibling(struct task_struct *p, int target) 
		if (!smt && (sd->flags & SD_SHARE_CPUPOWER))

			continue;



		if (!(sd->flags & SD_SHARE_PKG_RESOURCES)) {

			if (!smt) {

				smt = 1;

				goto again;

			}

		if (smt && !(sd->flags & SD_SHARE_CPUPOWER))

			break;



		if (!(sd->flags & SD_SHARE_PKG_RESOURCES))

			break;

		}



		sg = sd->groups;

		do {
@@ -2378,6 +2376,10 @@ static int select_idle_sibling(struct task_struct *p, int target) 
			sg = sg->next;

		} while (sg != sd->groups);

	}

	if (!smt) {

		smt = 1;

		goto again;

	}

done:

	rcu_read_unlock();