[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>

2 files changed, 3 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 4e009fde4b69..a9e99f8328ff 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -567,7 +567,6 @@ config SLAB
           a slab allocator.
 
 config SLUB
-        depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT
         bool "SLUB (Unqueued Allocator)"
         help
            SLUB is a slab allocator that minimizes cache line usage
@@ -577,14 +576,11 @@ config SLUB
            and has enhanced diagnostics.
 
 config SLOB
-#
-#       SLOB does not support SMP because SLAB_DESTROY_BY_RCU is unsupported
-#
-        depends on EMBEDDED && !SMP && !SPARSEMEM
+        depends on EMBEDDED && !SPARSEMEM
         bool "SLOB (Simple Allocator)"
         help
            SLOB replaces the SLAB allocator with a drastically simpler
-           allocator.  SLOB is more space efficient that SLAB but does not
+           allocator.  SLOB is more space efficient than SLAB but does not
            scale well (single lock for all operations) and is also highly
            susceptible to fragmentation. SLUB can accomplish a higher object
            density. It is usually better to use SLUB instead of SLOB.
diff --git a/init/main.c b/init/main.c
index 1940fa75e82e..eb8bdbae4fc7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line)
  * gcc-3.4 accidentally inlines this function, so use noinline.
  */
 
-static void noinline rest_init(void)
+static void noinline __init_refok rest_init(void)
         __releases(kernel_lock)
 {
         int pid;