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

Commit 669fc2f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'sched-urgent-for-linus', 'timers-urgent-for-linus' and... 

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

Pull scheduler, timer and x86 fixes from Ingo Molnar:
 - A context tracking ARM build and functional fix
 - A handful of ARM clocksource/clockevent driver fixes
 - An AMD microcode patch level sysfs reporting fixlet

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arm: Fix build error with context tracking calls

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: em_sti: Set cpu_possible_mask to fix SMP broadcast
  clocksource: of: Respect device tree node status
  clocksource: exynos_mct: Set IRQ affinity when the CPU goes online
  arm: clocksource: mvebu: Use the main timer as clock source from DT

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode/AMD: Fix patch level reporting for family 15h
parents 9b565a80 62d08aec 2199a557 accd1e82

arch/arm/kernel/entry-header.S

+4 −4
Original line number Diff line number Diff line
@@ -329,10 +329,10 @@ 
#ifdef CONFIG_CONTEXT_TRACKING

	.if	\save

	stmdb   sp!, {r0-r3, ip, lr}

	bl	user_exit

	bl	context_tracking_user_exit

	ldmia	sp!, {r0-r3, ip, lr}

	.else

	bl	user_exit

	bl	context_tracking_user_exit

	.endif

#endif

	.endm
@@ -341,10 +341,10 @@ 
#ifdef CONFIG_CONTEXT_TRACKING

	.if	\save

	stmdb   sp!, {r0-r3, ip, lr}

	bl	user_enter

	bl	context_tracking_user_enter

	ldmia	sp!, {r0-r3, ip, lr}

	.else

	bl	user_enter

	bl	context_tracking_user_enter

	.endif

#endif

	.endm

arch/x86/kernel/microcode_amd.c

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ int apply_microcode_amd(int cpu) 
	/* need to apply patch? */

	if (rev >= mc_amd->hdr.patch_id) {

		c->microcode = rev;

		uci->cpu_sig.rev = rev;

		return 0;

	}

drivers/clocksource/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config DW_APB_TIMER_OF 


config ARMADA_370_XP_TIMER

	bool

	select CLKSRC_OF



config ORION_TIMER

	select CLKSRC_OF

drivers/clocksource/clksrc-of.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ void __init clocksource_of_init(void) 
	clocksource_of_init_fn init_func;



	for_each_matching_node_and_match(np, __clksrc_of_table, &match) {

		if (!of_device_is_available(np))

			continue;



		init_func = match->data;

		init_func(np);

	}

drivers/clocksource/em_sti.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p) 
	ced->name = dev_name(&p->pdev->dev);

	ced->features = CLOCK_EVT_FEAT_ONESHOT;

	ced->rating = 200;

	ced->cpumask = cpumask_of(0);

	ced->cpumask = cpu_possible_mask;

	ced->set_next_event = em_sti_clock_event_next;

	ced->set_mode = em_sti_clock_event_mode;