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

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

Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus',... 

Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: avoid pointless blocked-task warnings
  rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status
  rtmutex: Fix comment about why new_owner can be NULL in wake_futex_pi()

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, olpc: Add missing Kconfig dependencies
  x86, mrst: Set correct APB timer IRQ affinity for secondary cpu
  x86: tsc: Fix calibration refinement conditionals to avoid divide by zero
  x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timekeeping: Make local variables static
  time: Rename misnamed minsec argument of clocks_calc_mult_shift()

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing: Remove syscall_exit_fields
  tracing: Only process module tracepoints once
  perf record: Add "nodelay" mode, disabled by default
  perf sched: Fix list of events, dropping unsupported ':r' modifier
  Revert "perf tools: Emit clearer message for sys_perf_event_open ENOENT return"
  perf top: Fix annotate segv
  perf evsel: Fix order of event list deletion
parents 16c10203 1161ec94 76d1f7bf afa14e7c 7c46d8da

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2068,6 +2068,7 @@ config OLPC 
	bool "One Laptop Per Child support"

	select GPIOLIB

	select OLPC_OPENFIRMWARE

	depends on !X86_64 && !X86_PAE

	---help---

	  Add support for detecting the unique features of the OLPC

	  XO hardware.

arch/x86/kernel/apb_timer.c

+8 −6
Original line number Diff line number Diff line
@@ -313,13 +313,15 @@ static void apbt_setup_irq(struct apbt_dev *adev) 
	if (adev->irq == 0)

		return;



	if (system_state == SYSTEM_BOOTING) {

	irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT);

	irq_set_affinity(adev->irq, cpumask_of(adev->cpu));

	/* APB timer irqs are set up as mp_irqs, timer is edge type */

	__set_irq_handler(adev->irq, handle_edge_irq, 0, "edge");



	if (system_state == SYSTEM_BOOTING) {

		if (request_irq(adev->irq, apbt_interrupt_handler,

				IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,

					IRQF_TIMER | IRQF_DISABLED |

					IRQF_NOBALANCING,

					adev->name, adev)) {

			printk(KERN_ERR "Failed request IRQ for APBT%d\n",

			       adev->num);

arch/x86/kernel/tsc.c

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ unsigned long native_calibrate_tsc(void) 
		tsc_pit_min = min(tsc_pit_min, tsc_pit_khz);



		/* hpet or pmtimer available ? */

		if (!hpet && !ref1 && !ref2)

		if (ref1 == ref2)

			continue;



		/* Check, whether the sampling was disturbed by an SMI */
@@ -935,7 +935,7 @@ static void tsc_refine_calibration_work(struct work_struct *work) 
	tsc_stop = tsc_read_refs(&ref_stop, hpet);



	/* hpet or pmtimer available ? */

	if (!hpet && !ref_start && !ref_stop)

	if (ref_start == ref_stop)

		goto out;



	/* Check, whether the sampling was disturbed by an SMI */

drivers/acpi/numa.c

+2 −6
Original line number Diff line number Diff line
@@ -275,23 +275,19 @@ acpi_table_parse_srat(enum acpi_srat_type id, 
int __init acpi_numa_init(void)

{

	int ret = 0;

	int nr_cpu_entries = nr_cpu_ids;



#ifdef CONFIG_X86

	/*

	 * Should not limit number with cpu num that is from NR_CPUS or nr_cpus=

	 * SRAT cpu entries could have different order with that in MADT.

	 * So go over all cpu entries in SRAT to get apicid to node mapping.

	 */

	nr_cpu_entries = MAX_LOCAL_APIC;

#endif



	/* SRAT: Static Resource Affinity Table */

	if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {

		acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,

				     acpi_parse_x2apic_affinity, nr_cpu_entries);

				     acpi_parse_x2apic_affinity, 0);

		acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,

				     acpi_parse_processor_affinity, nr_cpu_entries);

				     acpi_parse_processor_affinity, 0);

		ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,

					    acpi_parse_memory_affinity,

					    NR_NODE_MEMBLKS);

include/trace/events/module.h

+10 −0
Original line number Diff line number Diff line 
/*

 * Because linux/module.h has tracepoints in the header, and ftrace.h

 * eventually includes this file, define_trace.h includes linux/module.h

 * But we do not want the module.h to override the TRACE_SYSTEM macro

 * variable that define_trace.h is processing, so we only set it

 * when module events are being processed, which would happen when

 * CREATE_TRACE_POINTS is defined.

 */

#ifdef CREATE_TRACE_POINTS

#undef TRACE_SYSTEM

#define TRACE_SYSTEM module

#endif



#if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_MODULE_H