git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
vpe.c
diff --git
a/arch/mips/kernel/vpe.c
b/arch/mips/kernel/vpe.c
index
6cbeb2a
..
9a1ab7e
100644
(file)
--- a/
arch/mips/kernel/vpe.c
+++ b/
arch/mips/kernel/vpe.c
@@
-73,7
+73,7
@@
static int major;
static const int minor = 1; /* fixed for now */
#ifdef CONFIG_MIPS_APSP_KSPD
static const int minor = 1; /* fixed for now */
#ifdef CONFIG_MIPS_APSP_KSPD
-
static struct kspd_notifications kspd_events;
+static struct kspd_notifications kspd_events;
static int kspd_events_reqd = 0;
#endif
static int kspd_events_reqd = 0;
#endif
@@
-185,18
+185,6
@@
static struct tc *get_tc(int index)
return NULL;
}
return NULL;
}
-struct tc *get_tc_unused(void)
-{
- struct tc *t;
-
- list_for_each_entry(t, &vpecontrol.tc_list, list) {
- if (t->state == TC_STATE_UNUSED)
- return t;
- }
-
- return NULL;
-}
-
/* allocate a vpe and associate it with this minor (or index) */
static struct vpe *alloc_vpe(int minor)
{
/* allocate a vpe and associate it with this minor (or index) */
static struct vpe *alloc_vpe(int minor)
{