diff --git a/debian/changelog b/debian/changelog index cb50761d1..599575529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium - [/kirkwood] Disable NETLINK_MMAP - [/kirkwood] Disable PROFILING - [/kirkwood] Disable BPF_JIT + - [/kirkwood] Disable KPROBES -- Ben Hutchings Sat, 13 Dec 2014 11:45:48 +0000 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 81ea6d65b..236864548 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -1,3 +1,8 @@ +## +## file: arch/Kconfig +## +# CONFIG_KPROBES is not set + ## ## file: arch/arm/Kconfig ## diff --git a/debian/config/armel/defines b/debian/config/armel/defines index 6002e1a99..c2b28069b 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -61,6 +61,22 @@ ignore-changes: ring_buffer_swap_cpu task_handoff_register task_handoff_unregister + disable_kprobe + enable_kprobe + jprobe_return + profile_hits + register_jprobe + register_jprobes + register_kprobe + register_kprobes + register_kretprobe + register_kretprobes + unregister_jprobe + unregister_jprobes + unregister_kprobe + unregister_kprobes + unregister_kretprobe + unregister_kretprobes [orion5x_description] hardware: Marvell Orion