rpms/kernel/devel linux-2.6-crash-driver.patch, 1.9, 1.10 linux-2.6-execshield.patch, 1.78, 1.79 linux-2.6-squashfs.patch, 1.24, 1.25

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20295

Modified Files:
	linux-2.6-crash-driver.patch linux-2.6-execshield.patch 
	linux-2.6-squashfs.patch 
Log Message:
various compile fixes

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-crash-driver.patch	15 Oct 2007 18:36:20 -0000	1.9
+++ linux-2.6-crash-driver.patch	31 Oct 2007 21:30:48 -0000	1.10
@@ -369,82 +369,3 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_IA64_CRASH_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-x86_64/crash.h linux-1060/include/asm-x86_64/crash.h
---- linux-1050/include/asm-x86/crash.h
-+++ linux-1060/include/asm-x86/crash.h
-@@ -0,0 +1,75 @@
-+#ifndef _ASM_X86_64_CRASH_H
-+#define _ASM_X86_64_CRASH_H
-+
-+/*
-+ * linux/include/asm-x86_64/crash.h
-+ *
-+ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/mm.h>
-+#include <linux/highmem.h>
-+#include <asm/mmzone.h>
-+
-+extern int page_is_ram(unsigned long);
-+
-+static inline void *
-+map_virtual(u64 offset, struct page **pp)
-+{
-+	struct page *page;
-+	unsigned long pfn;
-+	void *vaddr;
-+
-+	pfn = (unsigned long)(offset >> PAGE_SHIFT);
-+
-+	if (!page_is_ram(pfn)) {
-+		printk(KERN_INFO
-+		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
-+		return NULL;
-+	}
-+
-+	if (!pfn_valid(pfn)) {
-+		printk(KERN_INFO
-+		    "crash memory driver: invalid pfn: %lx )\n", pfn);
-+		return NULL;
-+	}
-+
-+	page = pfn_to_page(pfn);
-+
-+	vaddr = kmap(page);
-+	if (!vaddr) {
-+		printk(KERN_INFO
-+		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
-+			pfn, (unsigned long)page);
-+		return NULL;
-+	}
-+
-+	*pp = page;
-+	return (vaddr + (offset & (PAGE_SIZE-1)));
-+}
-+
-+static inline void unmap_virtual(struct page *page) 
-+{ 
-+	kunmap(page);
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _ASM_X86_64_CRASH_H */

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- linux-2.6-execshield.patch	31 Oct 2007 14:14:01 -0000	1.78
+++ linux-2.6-execshield.patch	31 Oct 2007 21:30:48 -0000	1.79
@@ -1085,12 +1085,14 @@
  /*
 --- linux-2.6.23.noarch/include/asm-x86/elf.h~	2007-10-29 19:23:46.000000000 -0400
 +++ linux-2.6.23.noarch/include/asm-x86/elf.h	2007-10-29 19:24:09.000000000 -0400
-@@ -285,6 +285,9 @@ struct linux_binprm;
+@@ -285,6 +285,11 @@ struct linux_binprm;
  extern int arch_setup_additional_pages(struct linux_binprm *bprm,
  				       int executable_stack);
  
++#ifdef CONFIG_X86_32
 +#define __HAVE_ARCH_RANDOMIZE_BRK
 +extern void randomize_brk(unsigned long old_brk);
++#endif
 +
  #endif /* __KERNEL__ */
  

linux-2.6-squashfs.patch:

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linux-2.6-squashfs.patch	17 Oct 2007 23:00:27 -0000	1.24
+++ linux-2.6-squashfs.patch	31 Oct 2007 21:30:48 -0000	1.25
@@ -86,7 +86,7 @@
 diff -x .gitignore -Nurp linux-2.6.20/fs/squashfs/inode.c linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c
 --- linux-2.6.20/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.20-squashfs3.2-r2/fs/squashfs/inode.c	2007-01-16 02:28:36.000000000 +0000
-@@ -0,0 +1,2330 @@
+@@ -0,0 +1,2328 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
@@ -2384,13 +2384,11 @@
 +}
 +
 +
-+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
++static void init_once(struct kmem_cache *cachep, void *foo)
 +{
 +	struct squashfs_inode_info *ei = foo;
 +
-+
-+
-+		inode_init_once(&ei->vfs_inode);
++	inode_init_once(&ei->vfs_inode);
 +}
 + 
 +