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:
  Deprecate the asm/semaphore.h files in feature-removal-schedule.
  Convert asm/semaphore.h users to linux/semaphore.h
  security: Remove unnecessary inclusions of asm/semaphore.h
  lib: Remove unnecessary inclusions of asm/semaphore.h
  kernel: Remove unnecessary inclusions of asm/semaphore.h
  include: Remove unnecessary inclusions of asm/semaphore.h
  fs: Remove unnecessary inclusions of asm/semaphore.h
  drivers: Remove unnecessary inclusions of asm/semaphore.h
  net: Remove unnecessary inclusions of asm/semaphore.h
  arch: Remove unnecessary inclusions of asm/semaphore.h
This commit is contained in:
Linus Torvalds
2008-04-21 15:41:27 -07:00
136 changed files with 44 additions and 143 deletions

View File

@@ -20,8 +20,8 @@
#include <linux/time.h>
#include <linux/wait.h>
#include <linux/semaphore.h>
#include <asm/atomic.h>
#include <asm/semaphore.h>
/*
* sema_t structure just maps to struct semaphore in Linux kernel.