diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:29 -0400 |
| commit | d7bb545d86825e635cab33a1dd81ca0ad7b92887 (patch) | |
| tree | 34da4139ef06ceab6549aea3906639c7413978c8 /lib/kernel_lock.c | |
| parent | 75e98b34155264d943aa53edce465e87f3ccbadf (diff) | |
| parent | 2342e51ba2b52a7f5b78227e6faa4603ed3632a0 (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Remove DEBUG_SEMAPHORE from Kconfig
Improve semaphore documentation
Simplify semaphore implementation
Add down_timeout and change ACPI to use it
Introduce down_killable()
Generic semaphore implementation
Add semaphore.h to kernel_lock.c
Fix quota.h includes
Diffstat (limited to 'lib/kernel_lock.c')
| -rw-r--r-- | lib/kernel_lock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c index 812dbf00844b..fbc11a336bc5 100644 --- a/lib/kernel_lock.c +++ b/lib/kernel_lock.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/smp_lock.h> | 8 | #include <linux/smp_lock.h> |
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/kallsyms.h> | 10 | #include <linux/kallsyms.h> |
| 11 | #include <asm/semaphore.h> | ||
| 11 | 12 | ||
| 12 | /* | 13 | /* |
| 13 | * The 'big kernel semaphore' | 14 | * The 'big kernel semaphore' |