debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fix conflict between 4.4.4 and -rt patches 

"random: Make it work on rt" has a textual conflict with
"genirq: Validate action before dereferencing it in handle_irq_event_percpu()"
This commit is contained in:
Ben Hutchings 2016-03-06 03:27:56 +00:00
parent ab1abc27cc
commit 32edf5348f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/features/all/rt/random-make-it-work-on-rt.patch vendored
View File

@ -86,9 +86,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
irqreturn_t retval = IRQ_NONE;
unsigned int flags = 0, irq = desc->irq_data.irq;
struct irqaction *action = desc->action;
@@ -175,7 +177,11 @@ irqreturn_t handle_irq_event_percpu(stru
@@ -176,7 +178,11 @@ irqreturn_t handle_irq_event_percpu(stru
action = action->next;
} while (action);
}
- add_interrupt_randomness(irq, flags);
+#ifdef CONFIG_PREEMPT_RT_FULL