diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-07-11 22:08:37 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-12 12:22:34 -0700 |
commit | 405f55712dfe464b3240d7816cc4fe4174831be2 (patch) | |
tree | 96c425ea7fa8b31058b8f83a433c5e5265c8ebc7 /drivers/telephony | |
parent | f9fabcb58a6d26d6efde842d1703ac7cfa9427b6 (diff) | |
download | kernel_samsung_crespo-405f55712dfe464b3240d7816cc4fe4174831be2.zip kernel_samsung_crespo-405f55712dfe464b3240d7816cc4fe4174831be2.tar.gz kernel_samsung_crespo-405f55712dfe464b3240d7816cc4fe4174831be2.tar.bz2 |
headers: smp_lock.h redux
* Remove smp_lock.h from files which don't need it (including some headers!)
* Add smp_lock.h to files which do need it
* Make smp_lock.h include conditional in hardirq.h
It's needed only for one kernel_locked() usage which is under CONFIG_PREEMPT
This will make hardirq.h inclusion cheaper for every PREEMPT=n config
(which includes allmodconfig/allyesconfig, BTW)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/telephony')
-rw-r--r-- | drivers/telephony/ixj.c | 1 | ||||
-rw-r--r-- | drivers/telephony/phonedev.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index a913efc..40de151 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -257,6 +257,7 @@ #include <linux/fs.h> /* everything... */ #include <linux/errno.h> /* error codes */ #include <linux/slab.h> +#include <linux/smp_lock.h> #include <linux/mm.h> #include <linux/ioport.h> #include <linux/interrupt.h> diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index b52cc83..f3873f6 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c @@ -23,7 +23,6 @@ #include <linux/errno.h> #include <linux/phonedev.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/system.h> |