diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /kernel | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 2 | ||||
-rw-r--r-- | kernel/posix-timers.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index bfb1c0e940e8..9e459fefda77 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -50,8 +50,6 @@ | |||
50 | #include <asm/pgtable.h> | 50 | #include <asm/pgtable.h> |
51 | #include <asm/mmu_context.h> | 51 | #include <asm/mmu_context.h> |
52 | 52 | ||
53 | extern void sem_exit (void); | ||
54 | |||
55 | static void exit_mm(struct task_struct * tsk); | 53 | static void exit_mm(struct task_struct * tsk); |
56 | 54 | ||
57 | static void __unhash_process(struct task_struct *p) | 55 | static void __unhash_process(struct task_struct *p) |
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 35b4bbfc78ff..36d563fd9e3b 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -493,7 +493,7 @@ sys_timer_create(const clockid_t which_clock, | |||
493 | goto retry; | 493 | goto retry; |
494 | else if (error) { | 494 | else if (error) { |
495 | /* | 495 | /* |
496 | * Wierd looking, but we return EAGAIN if the IDR is | 496 | * Weird looking, but we return EAGAIN if the IDR is |
497 | * full (proper POSIX return value for this) | 497 | * full (proper POSIX return value for this) |
498 | */ | 498 | */ |
499 | error = -EAGAIN; | 499 | error = -EAGAIN; |