diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 13:10:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 13:10:16 -0400 |
| commit | 2b6b6d385d2933c105e27f2d25fdb36d392d7f59 (patch) | |
| tree | 427187b324a627098e0da53f28a3dee8bda93988 /arch/microblaze/kernel/process.c | |
| parent | 3e862dd5c94cc53ba6494804c7388303e3d25403 (diff) | |
| parent | 0a8c791437db4937bd160570f594d0286d3dd78d (diff) | |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add missing FILE tag to MAINTAINERS
microblaze: remove duplicated #include's
microblaze: struct device - replace bus_id with dev_name()
microblaze: Simplify copy_thread()
microblaze: Add TIMESTAMPING constants to socket.h
microblaze: Add missing empty ftrace.h file
microblaze: Fix problem with removing zero length files
Diffstat (limited to 'arch/microblaze/kernel/process.c')
| -rw-r--r-- | arch/microblaze/kernel/process.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c index 60e9ed7d3132..436f26ccbfa9 100644 --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c | |||
| @@ -115,8 +115,7 @@ void flush_thread(void) | |||
| 115 | { | 115 | { |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | /* FIXME - here will be a proposed change -> remove nr parameter */ | 118 | int copy_thread(unsigned long clone_flags, unsigned long usp, |
| 119 | int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | ||
| 120 | unsigned long unused, | 119 | unsigned long unused, |
| 121 | struct task_struct *p, struct pt_regs *regs) | 120 | struct task_struct *p, struct pt_regs *regs) |
| 122 | { | 121 | { |