Commit a05e783cb8853210628bd1f2bd82d17dd004c9d1 did not properly backport the symbols for: schedule_delayed_work schedule_delayed_work_on as it left the 'compat' string there when adding the LINUX_BACKPORT symbol. This resulted in these two not getting redefined and kernels with these backported resulted in duplicate symbols when trying to load compat.ko. Signed-off-by: Andy Gospodarek <andy@xxxxxxxxxxxxx> --- include/linux/compat-2.6.36.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h index d90b84f..b760a62 100644 --- a/include/linux/compat-2.6.36.h +++ b/include/linux/compat-2.6.36.h @@ -168,10 +168,10 @@ void backport_system_workqueue_destroy(void); int schedule_work(struct work_struct *work); #define schedule_work_on LINUX_BACKPORT(schedule_work_on) int schedule_work_on(int cpu, struct work_struct *work); -#define compat_schedule_delayed_work LINUX_BACKPORT(compat_schedule_delayed_work) +#define schedule_delayed_work LINUX_BACKPORT(schedule_delayed_work) int schedule_delayed_work(struct delayed_work *dwork, unsigned long delay); -#define compat_schedule_delayed_work_on LINUX_BACKPORT(compat_schedule_delayed_work_on) +#define schedule_delayed_work_on LINUX_BACKPORT(schedule_delayed_work_on) int schedule_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay); -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
