55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From 87b9564badf043711b03d381536be29103e9cce9 Mon Sep 17 00:00:00 2001
|
|
From: Steven Rostedt <srostedt@redhat.com>
|
|
Date: Mon, 16 Apr 2012 21:51:54 -0400
|
|
Subject: [PATCH 266/267] rt: Make migrate_disable/enable() and
|
|
__rt_mutex_init non-GPL only
|
|
|
|
Modules that load on the normal vanilla kernel should also load on
|
|
an -rt kernel as well. This does not mean we condone non-GPL modules,
|
|
we are only being consistent.
|
|
|
|
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
|
|
---
|
|
kernel/rtmutex.c | 2 +-
|
|
kernel/sched.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
|
|
index b525158..9c4f6e5 100644
|
|
--- a/kernel/rtmutex.c
|
|
+++ b/kernel/rtmutex.c
|
|
@@ -1290,7 +1290,7 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name)
|
|
|
|
debug_rt_mutex_init(lock, name);
|
|
}
|
|
-EXPORT_SYMBOL_GPL(__rt_mutex_init);
|
|
+EXPORT_SYMBOL(__rt_mutex_init);
|
|
|
|
/**
|
|
* rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
|
|
diff --git a/kernel/sched.c b/kernel/sched.c
|
|
index 1cc706d..3b12e0b 100644
|
|
--- a/kernel/sched.c
|
|
+++ b/kernel/sched.c
|
|
@@ -4426,7 +4426,7 @@ void migrate_disable(void)
|
|
p->migrate_disable = 1;
|
|
preempt_enable();
|
|
}
|
|
-EXPORT_SYMBOL_GPL(migrate_disable);
|
|
+EXPORT_SYMBOL(migrate_disable);
|
|
|
|
void migrate_enable(void)
|
|
{
|
|
@@ -4478,7 +4478,7 @@ void migrate_enable(void)
|
|
unpin_current_cpu();
|
|
preempt_enable();
|
|
}
|
|
-EXPORT_SYMBOL_GPL(migrate_enable);
|
|
+EXPORT_SYMBOL(migrate_enable);
|
|
#else
|
|
static inline void update_migrate_disable(struct task_struct *p) { }
|
|
#define migrate_disabled_updated(p) 0
|
|
--
|
|
1.7.10
|
|
|