uml-2.6.7-1um

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 65b6899..ef5d5d1 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -284,25 +284,13 @@ static struct inode *hostfs_alloc_inode(struct super_block *sb)
        return(&hi->vfs_inode);
 }
 
-static void hostfs_delete_inode(struct inode *inode)
-{
-       if(HOSTFS_I(inode)->fd != -1) {
-               close_file(&HOSTFS_I(inode)->fd);
-               printk("Closing host fd in .delete_inode\n");
-               HOSTFS_I(inode)->fd = -1;
-       }
-       clear_inode(inode);
-}
-
 static void hostfs_destroy_inode(struct inode *inode)
 {
        if(HOSTFS_I(inode)->host_filename) 
                kfree(HOSTFS_I(inode)->host_filename);
 
-       if(HOSTFS_I(inode)->fd != -1) {
+       if(HOSTFS_I(inode)->fd != -1) 
                close_file(&HOSTFS_I(inode)->fd);
-               printk("Closing host fd in .destroy_inode\n");
-       }
 
        kfree(HOSTFS_I(inode));
 }
@@ -314,8 +302,6 @@ static void hostfs_read_inode(struct inode *inode)
 
 static struct super_operations hostfs_sbops = { 
        .alloc_inode    = hostfs_alloc_inode,
-       .drop_inode     = generic_delete_inode,
-       .delete_inode   = hostfs_delete_inode,
        .destroy_inode  = hostfs_destroy_inode,
        .read_inode     = hostfs_read_inode,
        .statfs         = hostfs_statfs,

diff --git a/mm/Makefile b/mm/Makefile
index b19c961..0dd8ea1 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -14,5 +14,5 @@ obj-y                 := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
 
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o
 obj-$(CONFIG_HUGETLBFS)        += hugetlb.o
-obj-$(CONFIG_NUMA)     += mempolicy.o
 obj-$(CONFIG_PROC_MM)  += proc_mm.o
+obj-$(CONFIG_NUMA)     += mempolicy.o

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 4cda24e..8bd6442 100644 (file)
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -93,14 +93,6 @@
  * (Note: it'd be easy to port over the complete mkdep state machine,
  *  but I don't think the added complexity is worth it)
  */
-/*
- * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto
- * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not
- * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as
- * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,
- * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that
- * those files will have correct dependencies.
- */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -318,7 +310,6 @@ void parse_dep_file(void *map, size_t len)
                }
                memcpy(s, m, p-m); s[p-m] = 0;
                if (strrcmp(s, "include/linux/autoconf.h") &&
-                   strrcmp(s, "arch/um/include/uml-config.h") &&
                    strrcmp(s, ".ver")) {
                        printf("  %s \\\n", s);
                        do_config_file(s);