diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 15:56:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 15:56:25 -0700 |
| commit | 73f1f5dd3ee3ec6e20768d831d9759b0330fad0e (patch) | |
| tree | 22f8498c47467f468dce6c3bca0eb1f3a0c9ade0 /arch | |
| parent | 30a08bf2d31d275c6fc71dd1811342777e95c831 (diff) | |
| parent | 93c2d656c7120e29de8df5bc17bb2a97664104e9 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (4 patches)
frv: delete incorrect task prototypes causing compile fail
slub: missing test for partial pages flush work in flush_all()
fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries
drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/frv/include/asm/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h index 81c2e271d62..9b1a92b73f6 100644 --- a/arch/frv/include/asm/processor.h +++ b/arch/frv/include/asm/processor.h @@ -135,10 +135,6 @@ unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) ((tsk)->thread.frame0->pc) #define KSTK_ESP(tsk) ((tsk)->thread.frame0->sp) -/* Allocation and freeing of basic task resources. */ -extern struct task_struct *alloc_task_struct_node(int node); -extern void free_task_struct(struct task_struct *p); - #define cpu_relax() barrier() /* data cache prefetch */ |