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

diff --combined arch/s390/kernel/Makefile
index ef2b247,ce144b6..77051cd
--- 1/arch/s390/kernel/Makefile
--- 2/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@@ -11,7 -11,7 +11,7 @@@ CFLAGS_smp.o  := -Wno-nonnul
  
  obj-y :=  bitmap.o traps.o time.o process.o base.o early.o \
              setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
-           semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o
+           s390_ext.o debug.o irq.o ipl.o dis.o diag.o
  
  obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o)
  obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
@@@ -19,7 -19,7 +19,7 @@@
  extra-y                               += head.o init_task.o vmlinux.lds
  
  obj-$(CONFIG_MODULES)         += s390_ksyms.o module.o
 -obj-$(CONFIG_SMP)             += smp.o
 +obj-$(CONFIG_SMP)             += smp.o topology.o
  
  obj-$(CONFIG_AUDIT)           += audit.o
  compat-obj-$(CONFIG_AUDIT)    += compat_audit.o

diff --combined lib/Kconfig.debug
index eef557d,099cb7b..80db357
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -211,7 -211,7 +211,7 @@@ config SLUB_DEBUG_O
  config SLUB_STATS
        default n
        bool "Enable SLUB performance statistics"
 -      depends on SLUB
 +      depends on SLUB && SLUB_DEBUG && SYSFS
        help
          SLUB statistics are useful to debug SLUBs allocation behavior in
          order find ways to optimize the allocator. This should never be
@@@ -265,16 -265,6 +265,6 @@@ config DEBUG_MUTEXE
         This feature allows mutex semantics violations to be detected and
         reported.
  
- config DEBUG_SEMAPHORE
-       bool "Semaphore debugging"
-       depends on DEBUG_KERNEL
-       depends on ALPHA || FRV
-       default n
-       help
-         If you say Y here then semaphore processing will issue lots of
-         verbose debugging messages.  If you suspect a semaphore problem or a
-         kernel hacker asks for this option then say Y.  Otherwise say N.
- 
  config DEBUG_LOCK_ALLOC
        bool "Lock debugging: detect incorrect freeing of live locks"
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT