diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 00:31:33 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 00:53:44 +0200 |
commit | cd3411088f6bb4393d79c50b5f7eef3f11a83435 (patch) | |
tree | e1b44fd7c353d9018f489d03f3dea78bc876b94a /recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch | |
download | meta-enea-cd3411088f6bb4393d79c50b5f7eef3f11a83435.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch')
-rw-r--r-- | recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch b/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch new file mode 100644 index 0000000..b8ef705 --- /dev/null +++ b/recipes-kernel/linux/files/b4860-hard_irq_disable-bug.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | linux-qoriq-sdk: Repair a kernel compile issue due to a sintax error. | ||
2 | |||
3 | The define __hard_irq_disable() was done using ";" character | ||
4 | into the comment so the if structure did not recognized the | ||
5 | "else" branch. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Alexandru Vaduva <alexandru.vaduva@enea.com> | ||
10 | |||
11 | diff -ruN a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c | ||
12 | --- a/arch/powerpc/kernel/irq.c 2014-01-30 12:56:20.470918180 +0100 | ||
13 | +++ b/arch/powerpc/kernel/irq.c 2014-01-30 12:57:25.228109187 +0100 | ||
14 | @@ -227,8 +227,9 @@ | ||
15 | * common cases that we'll ignore for now), so we skip the | ||
16 | * (expensive) mtmsrd. | ||
17 | */ | ||
18 | - if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) | ||
19 | + if (unlikely(irq_happened != PACA_IRQ_HARD_DIS)) { | ||
20 | __hard_irq_disable(); | ||
21 | + } | ||
22 | #ifdef CONFIG_TRACE_IRQFLAGS | ||
23 | else { | ||
24 | /* | ||