diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/mips/kernel/kspd.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/mips/kernel/kspd.c')
| -rw-r--r-- | arch/mips/kernel/kspd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index fd6e51224034..f2397f00db43 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/rtlx.h> | 31 | #include <asm/rtlx.h> |
| 32 | #include <asm/kspd.h> | 32 | #include <asm/kspd.h> |
| 33 | 33 | ||
| 34 | static struct workqueue_struct *workqueue = NULL; | 34 | static struct workqueue_struct *workqueue; |
| 35 | static struct work_struct work; | 35 | static struct work_struct work; |
| 36 | 36 | ||
| 37 | extern unsigned long cpu_khz; | 37 | extern unsigned long cpu_khz; |
| @@ -58,7 +58,7 @@ struct mtsp_syscall_generic { | |||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static struct list_head kspd_notifylist; | 60 | static struct list_head kspd_notifylist; |
| 61 | static int sp_stopping = 0; | 61 | static int sp_stopping; |
| 62 | 62 | ||
| 63 | /* these should match with those in the SDE kit */ | 63 | /* these should match with those in the SDE kit */ |
| 64 | #define MTSP_SYSCALL_BASE 0 | 64 | #define MTSP_SYSCALL_BASE 0 |
| @@ -328,7 +328,7 @@ static void sp_cleanup(void) | |||
| 328 | sys_chdir("/"); | 328 | sys_chdir("/"); |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | static int channel_open = 0; | 331 | static int channel_open; |
| 332 | 332 | ||
| 333 | /* the work handler */ | 333 | /* the work handler */ |
| 334 | static void sp_work(struct work_struct *unused) | 334 | static void sp_work(struct work_struct *unused) |