Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 47 insertions, 17 deletions

diff --git a/init/Kconfig b/init/Kconfig
index e0358f3946a1..f70f2fd273c2 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config DEFCONFIG_LIST
+        string
+        option defconfig_list
+        default "/lib/modules/$UNAME_RELEASE/.config"
+        default "/etc/kernel-config"
+        default "/boot/config-$UNAME_RELEASE"
+        default "arch/$ARCH/defconfig"
+
 menu "Code maturity level options"
 
 config EXPERIMENTAL
@@ -236,16 +244,6 @@ config UID16
         help
           This enables the legacy 16-bit UID syscall wrappers.
 
-config VM86
-        depends X86
-        default y
-        bool "Enable VM86 support" if EMBEDDED
-        help
-          This option is required by programs like DOSEMU to run 16-bit legacy
-          code on X86 processors. It also may be needed by software like
-          XFree86 to initialize some video cards via BIOS. Disabling this
-          option saves about 6k.
-
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size (Look out for broken compilers!)"
         default y
@@ -341,9 +339,14 @@ config BASE_FULL
           kernel data structures. This saves memory on small machines,
           but may reduce performance.
 
+config RT_MUTEXES
+        boolean
+        select PLIST
+
 config FUTEX
         bool "Enable futex support" if EMBEDDED
         default y
+        select RT_MUTEXES
         help
           Disabling this option will cause the kernel to be built without
           support for "fast userspace mutexes".  The resulting kernel may not
diff --git a/init/initramfs.c b/init/initramfs.c
index f81cfa40a719..d28c1094d7e5 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -30,6 +30,7 @@ static void __init free(void *where)
 
 static __initdata struct hash {
         int ino, minor, major;
+        mode_t mode;
         struct hash *next;
         char name[N_ALIGN(PATH_MAX)];
 } *head[32];
@@ -41,7 +42,8 @@ static inline int hash(int major, int minor, int ino)
         return tmp & 31;
 }
 
-static char __init *find_link(int major, int minor, int ino, char *name)
+static char __init *find_link(int major, int minor, int ino,
+                              mode_t mode, char *name)
 {
         struct hash **p, *q;
         for (p = head + hash(major, minor, ino); *p; p = &(*p)->next) {
@@ -51,14 +53,17 @@ static char __init *find_link(int major, int minor, int ino, char *name)
                         continue;
                 if ((*p)->major != major)
                         continue;
+                if (((*p)->mode ^ mode) & S_IFMT)
+                        continue;
                 return (*p)->name;
         }
         q = (struct hash *)malloc(sizeof(struct hash));
         if (!q)
                 panic("can't allocate link hash entry");
-        q->ino = ino;
-        q->minor = minor;
         q->major = major;
+        q->minor = minor;
+        q->ino = ino;
+        q->mode = mode;
         strcpy(q->name, name);
         q->next = NULL;
         *p = q;
@@ -229,13 +234,25 @@ static int __init do_reset(void)
 static int __init maybe_link(void)
 {
         if (nlink >= 2) {
-                char *old = find_link(major, minor, ino, collected);
+                char *old = find_link(major, minor, ino, mode, collected);
                 if (old)
                         return (sys_link(old, collected) < 0) ? -1 : 1;
         }
         return 0;
 }
 
+static void __init clean_path(char *path, mode_t mode)
+{
+        struct stat st;
+
+        if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
+                if (S_ISDIR(st.st_mode))
+                        sys_rmdir(path);
+                else
+                        sys_unlink(path);
+        }
+}
+
 static __initdata int wfd;
 
 static int __init do_name(void)
@@ -248,9 +265,15 @@ static int __init do_name(void)
         }
         if (dry_run)
                 return 0;
+        clean_path(collected, mode);
         if (S_ISREG(mode)) {
-                if (maybe_link() >= 0) {
-                        wfd = sys_open(collected, O_WRONLY|O_CREAT, mode);
+                int ml = maybe_link();
+                if (ml >= 0) {
+                        int openflags = O_WRONLY|O_CREAT;
+                        if (ml != 1)
+                                openflags |= O_TRUNC;
+                        wfd = sys_open(collected, openflags, mode);
+
                         if (wfd >= 0) {
                                 sys_fchown(wfd, uid, gid);
                                 sys_fchmod(wfd, mode);
@@ -291,6 +314,7 @@ static int __init do_copy(void)
 static int __init do_symlink(void)
 {
         collected[N_ALIGN(name_len) + body_len] = '\0';
+        clean_path(collected, 0);
         sys_symlink(collected + N_ALIGN(name_len), collected);
         sys_lchown(collected, uid, gid);
         state = SkipIt;
diff --git a/init/main.c b/init/main.c
index f715b9b89753..0d57f6ccb63a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -47,6 +47,8 @@
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
 #include <linux/key.h>
+#include <linux/unwind.h>
+#include <linux/buffer_head.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -79,7 +81,6 @@ extern void mca_init(void);
 extern void sbus_init(void);
 extern void sysctl_init(void);
 extern void signals_init(void);
-extern void buffer_init(void);
 extern void pidhash_init(void);
 extern void pidmap_init(void);
 extern void prio_tree_init(void);
@@ -482,6 +483,7 @@ asmlinkage void __init start_kernel(void)
                    __stop___param - __start___param,
                    &unknown_bootoption);
         sort_main_extable();
+        unwind_init();
         trap_init();
         rcu_init();
         init_IRQ();
@@ -490,6 +492,7 @@ asmlinkage void __init start_kernel(void)
         hrtimers_init();
         softirq_init();
         time_init();
+        timekeeping_init();
 
         /*
          * HACK ALERT! This is early. We're enabling the console before