From b4dc8777a029e939ceddfd3568c0e0e9e6e7bc29 Mon Sep 17 00:00:00 2001 From: braam Date: Mon, 26 May 2003 05:28:09 +0000 Subject: [PATCH] - automatically set up a 2.5 bk repository with symlink and Makefile fixes for builds - fix up patches, series files etc. Use some new names. --- lustre/kernel_patches/patches/uml-make-fix.patch | 42 +++++++++++++++ ...9-initial.diff => vfs_intent_2.5.69_rev1.patch} | 60 +--------------------- lustre/kernel_patches/pc/ext3-san-jdike-2.5.69.pc | 2 + lustre/kernel_patches/pc/iopen-jdike-2.5.69.pc | 8 +++ lustre/kernel_patches/pc/uml-make-fix.pc | 4 ++ lustre/kernel_patches/pc/vfs_intent_2.5.69_rev1.pc | 12 +++++ lustre/kernel_patches/series/jdike-2.5.69 | 5 +- 7 files changed, 72 insertions(+), 61 deletions(-) create mode 100644 lustre/kernel_patches/patches/uml-make-fix.patch rename lustre/kernel_patches/patches/{lustre-2.5.69-initial.diff => vfs_intent_2.5.69_rev1.patch} (93%) create mode 100644 lustre/kernel_patches/pc/ext3-san-jdike-2.5.69.pc create mode 100644 lustre/kernel_patches/pc/iopen-jdike-2.5.69.pc create mode 100644 lustre/kernel_patches/pc/uml-make-fix.pc create mode 100644 lustre/kernel_patches/pc/vfs_intent_2.5.69_rev1.pc diff --git a/lustre/kernel_patches/patches/uml-make-fix.patch b/lustre/kernel_patches/patches/uml-make-fix.patch new file mode 100644 index 0000000..1e9f978 --- /dev/null +++ b/lustre/kernel_patches/patches/uml-make-fix.patch @@ -0,0 +1,42 @@ + + + + Makefile | 2 ++ + fs/Makefile | 1 + + init/main.c | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) + +--- uml-2.5/Makefile~uml-make-fix 2003-05-25 21:25:55.000000000 -0600 ++++ uml-2.5-braam/Makefile 2003-05-25 21:51:40.000000000 -0600 +@@ -404,6 +404,8 @@ $(SUBDIRS): prepare + + .PHONY: prepare + prepare: include/linux/version.h include/asm include/config/MARKER ++ -ln -s arch/um/kernel/tt/include/ptrace-tt.h arch/um/include/sysdep/ptrace-tt.h ++ -ln -s /usr/src/lustre fs/lustre + ifdef KBUILD_MODULES + ifeq ($(origin SUBDIRS),file) + $(Q)rm -rf $(MODVERDIR) +--- uml-2.5/init/main.c~uml-make-fix 2003-05-25 21:43:27.000000000 -0600 ++++ uml-2.5-braam/init/main.c 2003-05-25 21:44:16.000000000 -0600 +@@ -47,7 +47,7 @@ + */ + #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 + #ifdef CONFIG_FRAME_POINTER +-#error This compiler cannot compile correctly with frame pointers enabled ++#warning This compiler cannot compile correctly with frame pointers enabled + #endif + #endif + +--- uml-2.5/fs/Makefile~uml-make-fix 2003-05-25 21:48:05.000000000 -0600 ++++ uml-2.5-braam/fs/Makefile 2003-05-25 21:48:57.000000000 -0600 +@@ -50,6 +50,7 @@ obj-$(CONFIG_PROFILING) += dcookies.o + obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3 + obj-$(CONFIG_JBD) += jbd/ + obj-$(CONFIG_EXT2_FS) += ext2/ ++obj-y += lustre/ + obj-$(CONFIG_CRAMFS) += cramfs/ + obj-$(CONFIG_RAMFS) += ramfs/ + obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ + +_ diff --git a/lustre/kernel_patches/patches/lustre-2.5.69-initial.diff b/lustre/kernel_patches/patches/vfs_intent_2.5.69_rev1.patch similarity index 93% rename from lustre/kernel_patches/patches/lustre-2.5.69-initial.diff rename to lustre/kernel_patches/patches/vfs_intent_2.5.69_rev1.patch index 4a825696..5b83e14 100644 --- a/lustre/kernel_patches/patches/lustre-2.5.69-initial.diff +++ b/lustre/kernel_patches/patches/vfs_intent_2.5.69_rev1.patch @@ -1,37 +1,3 @@ ---- ./arch/um/kernel/mem.c.lustre 2003-05-21 16:45:46.000000000 -0700 -+++ ./arch/um/kernel/mem.c 2003-05-21 16:52:09.000000000 -0700 -@@ -657,6 +657,22 @@ - return(phys_mem_map(pte_val(pte))); - } - -+struct page *check_get_page(unsigned long kaddr) -+{ -+ struct page *page; -+ struct mem_region *mr; -+ unsigned long phys = __pa(kaddr); -+ unsigned int n = phys_region_index(phys); -+ -+ if(regions[n] == NULL) -+ return NULL; -+ -+ mr = regions[n]; -+ page = (struct page *) mr->mem_map; -+ return page + ((phys_addr(phys)) >> PAGE_SHIFT); -+} -+ -+ - struct mem_region *page_region(struct page *page, int *index_out) - { - int i; -@@ -744,7 +760,7 @@ - (addr <= region->start + region->len)) - return(mk_phys(addr - region->start, i)); - } -- panic("region_pa : no region for virtual address"); -+ //panic("region_pa : no region for virtual address"); - return(0); - } - --- ./fs/nfsd/vfs.c.lustre 2003-05-21 16:46:55.000000000 -0700 +++ ./fs/nfsd/vfs.c 2003-05-21 16:52:09.000000000 -0700 @@ -1348,7 +1348,7 @@ @@ -797,16 +763,6 @@ extern int follow_down(struct vfsmount **, struct dentry **); extern int follow_up(struct vfsmount **, struct dentry **); ---- ./include/linux/slab.h.lustre 2003-05-21 16:47:32.000000000 -0700 -+++ ./include/linux/slab.h 2003-05-21 16:52:09.000000000 -0700 -@@ -59,6 +59,7 @@ - extern int kmem_cache_shrink(kmem_cache_t *); - extern void *kmem_cache_alloc(kmem_cache_t *, int); - extern void kmem_cache_free(kmem_cache_t *, void *); -+extern int kmem_cache_validate(kmem_cache_t *cachep, void *objp); - extern unsigned int kmem_cache_size(kmem_cache_t *); - - extern void *kmalloc(size_t, int); --- ./kernel/ksyms.c.lustre 2003-05-21 16:47:40.000000000 -0700 +++ ./kernel/ksyms.c 2003-05-21 16:52:09.000000000 -0700 @@ -374,6 +374,7 @@ @@ -824,26 +780,12 @@ +/* lustre */ +EXPORT_SYMBOL(do_kern_mount); +EXPORT_SYMBOL(exit_files); -+EXPORT_SYMBOL(kmem_cache_validate); ++//EXPORT_SYMBOL(kmem_cache_validate); + + /* waitqueue handling */ EXPORT_SYMBOL(add_wait_queue); EXPORT_SYMBOL(add_wait_queue_exclusive); ---- ./mm/slab.c.lustre 2003-05-21 16:47:41.000000000 -0700 -+++ ./mm/slab.c 2003-05-21 16:52:09.000000000 -0700 -@@ -1848,6 +1848,11 @@ - } - } - -+int kmem_cache_validate(kmem_cache_t *cachep, void *objp) -+{ -+ return 1; -+} -+ - /** - * kmem_cache_alloc - Allocate an object - * @cachep: The cache to allocate from. --- ./net/unix/af_unix.c.lustre 2003-05-21 16:47:50.000000000 -0700 +++ ./net/unix/af_unix.c 2003-05-21 16:52:09.000000000 -0700 @@ -721,7 +721,7 @@ diff --git a/lustre/kernel_patches/pc/ext3-san-jdike-2.5.69.pc b/lustre/kernel_patches/pc/ext3-san-jdike-2.5.69.pc new file mode 100644 index 0000000..231df0e --- /dev/null +++ b/lustre/kernel_patches/pc/ext3-san-jdike-2.5.69.pc @@ -0,0 +1,2 @@ +fs/ext3/inode.c +fs/ext3/super.c diff --git a/lustre/kernel_patches/pc/iopen-jdike-2.5.69.pc b/lustre/kernel_patches/pc/iopen-jdike-2.5.69.pc new file mode 100644 index 0000000..b40b1f3 --- /dev/null +++ b/lustre/kernel_patches/pc/iopen-jdike-2.5.69.pc @@ -0,0 +1,8 @@ +Documentation/filesystems/ext2.txt +fs/ext3/Makefile +fs/ext3/inode.c +fs/ext3/iopen.c +fs/ext3/iopen.h +fs/ext3/namei.c +fs/ext3/super.c +include/linux/ext3_fs.h diff --git a/lustre/kernel_patches/pc/uml-make-fix.pc b/lustre/kernel_patches/pc/uml-make-fix.pc new file mode 100644 index 0000000..977777a --- /dev/null +++ b/lustre/kernel_patches/pc/uml-make-fix.pc @@ -0,0 +1,4 @@ +Makefile +init/main.c +fs/Makefile +mm/Makefile diff --git a/lustre/kernel_patches/pc/vfs_intent_2.5.69_rev1.pc b/lustre/kernel_patches/pc/vfs_intent_2.5.69_rev1.pc new file mode 100644 index 0000000..03c2b8b --- /dev/null +++ b/lustre/kernel_patches/pc/vfs_intent_2.5.69_rev1.pc @@ -0,0 +1,12 @@ +fs/nfsd/vfs.c +fs/sysfs/inode.c +fs/namei.c +fs/dcache.c +fs/namespace.c +fs/open.c +fs/stat.c +include/linux/dcache.h +include/linux/fs.h +include/linux/namei.h +kernel/ksyms.c +net/unix/af_unix.c diff --git a/lustre/kernel_patches/series/jdike-2.5.69 b/lustre/kernel_patches/series/jdike-2.5.69 index cdeccef..af32189 100644 --- a/lustre/kernel_patches/series/jdike-2.5.69 +++ b/lustre/kernel_patches/series/jdike-2.5.69 @@ -1,5 +1,6 @@ -lustre_version.h -lustre-2.5.69-initial.diff +uml-make-fix.patch +lustre_version.patch +vfs_intent_2.5.69_rev1.patch ext3-san-jdike-2.5.69.patch iopen-jdike-2.5.69.patch export-truncate-2.5.63.patch -- 1.8.3.1