diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /lib | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 3 | ||||
| -rw-r--r-- | lib/ioremap.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index fbc5c622acb0..1ba77ca7d165 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -378,14 +378,13 @@ config FORCED_INLINING config RCU_TORTURE_TEST tristate "torture tests for RCU" depends on DEBUG_KERNEL + depends on m default n help This option provides a kernel module that runs torture tests on the RCU infrastructure. The kernel module may be built after the fact on the running kernel to be tested, if desired. - Say Y here if you want RCU torture tests to start automatically - at boot time (you probably don't). Say M if you want the RCU torture tests to build as a module. Say N if you are unsure. diff --git a/lib/ioremap.c b/lib/ioremap.c index a9e4415b02dc..760521417b69 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -7,7 +7,7 @@ */ #include <linux/vmalloc.h> #include <linux/mm.h> - +#include <linux/sched.h> #include <asm/cacheflush.h> #include <asm/pgtable.h> |