Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4fc82c0a766cf1d0bc098fb42d00b5292dde65f7

Authored by Linus Torvalds
2 parents c6c9161d06 d7ce437749
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull powerpc fix from Michael Ellerman:
 "One fix from Scott, he says:

  This patch fixes a crash (introduced in v3.18-rc1) in the FSL MSI driver
  when threaded IRQs are enabled"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/fsl_msi: mark the msi cascade handler IRQF_NO_THREAD

Showing 1 changed file Side-by-side Diff

arch/powerpc/sysdev/fsl_msi.c
Diff comments   View file @ 4fc82c0
... ... @@ -361,7 +361,7 @@
361 361 cascade_data->virq = virt_msir;
362 362 msi->cascade_array[irq_index] = cascade_data;
363 363  
364   - ret = request_irq(virt_msir, fsl_msi_cascade, 0,
  364 + ret = request_irq(virt_msir, fsl_msi_cascade, IRQF_NO_THREAD,
365 365 "fsl-msi-cascade", cascade_data);
366 366 if (ret) {
367 367 dev_err(&dev->dev, "failed to request_irq(%d), ret = %d\n",