fixup error when LINUX_BACKPORT macro was added
authorAndy Gospodarek <andy@greyhouse.net>
Fri, 5 Apr 2013 02:04:46 +0000 (22:04 -0400)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 5 Apr 2013 09:42:05 +0000 (11:42 +0200)
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@greyhouse.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
backport/include/linux/compat-2.6.36.h

index 6afd66174a3ff8cba6152752c1be0c143f67420c..ff6a53f191db2e768148f30bed7a87e82b7404fd 100644 (file)
@@ -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);