rpms/kernel/FC-6 kernel-2.6.spec, 1.2955, 1.2956 linux-2.6-devmem.patch, 1.15, 1.16

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19592

Modified Files:
	kernel-2.6.spec linux-2.6-devmem.patch 
Log Message:
* Tue Jun 05 2007 Dave Jones <davej redhat com>
- Allow kdump to read /proc/kcore. (#241362)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2955
retrieving revision 1.2956
diff -u -r1.2955 -r1.2956
--- kernel-2.6.spec	2 Jun 2007 00:07:17 -0000	1.2955
+++ kernel-2.6.spec	5 Jun 2007 04:48:52 -0000	1.2956
@@ -2367,6 +2367,9 @@
 %endif
 
 %changelog
+* Tue Jun 05 2007 Dave Jones <davej redhat com>
+- Allow kdump to read /proc/kcore. (#241362)
+
 * Fri Jun 01 2007 Dave Jones <davej redhat com>			1.2955
 - Turn on vmcore proc file in all kernels for FC6 (Neil Horman). #241924
 

linux-2.6-devmem.patch:
 linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c |    2 
 linux-2.6.20.noarch/fs/proc/kcore.c                    |    4 
 linux-2.6.20.noarch/include/asm-ia64/page.h            |    1 
 linux-2.6/arch/i386/mm/init.c                          |   19 ++
 linux-2.6/arch/ia64/mm/init.c                          |    7 
 linux-2.6/arch/powerpc/mm/mem.c                        |   14 +
 linux-2.6/arch/s390/mm/init.c                          |    5 
 linux-2.6/arch/x86_64/mm/init.c                        |   42 ++++
 linux-2.6/drivers/char/mem.c                           |  144 ++---------------
 linux-2.6/fs/proc/kcore.c                              |    2 
 linux-2.6/include/asm-alpha/page.h                     |    2 
 linux-2.6/include/asm-arm/page.h                       |    2 
 linux-2.6/include/asm-arm26/page.h                     |    2 
 linux-2.6/include/asm-cris/page.h                      |    2 
 linux-2.6/include/asm-h8300/page.h                     |    2 
 linux-2.6/include/asm-i386/page.h                      |    2 
 linux-2.6/include/asm-m68k/page.h                      |    2 
 linux-2.6/include/asm-m68knommu/page.h                 |    2 
 linux-2.6/include/asm-mips/page.h                      |    2 
 linux-2.6/include/asm-parisc/page.h                    |    2 
 linux-2.6/include/asm-powerpc/page.h                   |    2 
 linux-2.6/include/asm-ppc/page.h                       |    2 
 linux-2.6/include/asm-s390/page.h                      |    2 
 linux-2.6/include/asm-sh/page.h                        |    2 
 linux-2.6/include/asm-sh64/page.h                      |    2 
 linux-2.6/include/asm-sparc/page.h                     |    2 
 linux-2.6/include/asm-sparc64/page.h                   |    2 
 linux-2.6/include/asm-um/page.h                        |    1 
 linux-2.6/include/asm-v850/page.h                      |    2 
 linux-2.6/include/asm-x86_64/page.h                    |    4 
 30 files changed, 156 insertions(+), 125 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-devmem.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-devmem.patch	14 Mar 2007 01:42:23 -0000	1.15
+++ linux-2.6-devmem.patch	5 Jun 2007 04:48:53 -0000	1.16
@@ -632,3 +632,33 @@
  #endif /* __KERNEL__ */
  
  #endif /* _X86_64_PAGE_H */
+--- linux-2.6.20.noarch/fs/proc/kcore.c.orig	2007-06-04 15:44:29.000000000 -0400
++++ linux-2.6.20.noarch/fs/proc/kcore.c	2007-06-04 15:48:57.000000000 -0400
+@@ -23,10 +23,10 @@
+ #include <asm/io.h>
+ 
+ #define CORE_STR "CORE"
+-
++unsigned int allow_kcore_access = 0;
+ static int open_kcore(struct inode * inode, struct file * filp)
+ {
+-	return -EPERM;
++	return (capable(CAP_SYS_RAWIO) && allow_kcore_access) ? 0 : -EPERM;
+ }
+ 
+ static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
+--- linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c.orig	2007-06-04 15:50:52.000000000 -0400
++++ linux-2.6.20.noarch/arch/x86_64/kernel/machine_kexec.c	2007-06-04 15:52:14.000000000 -0400
+@@ -236,10 +236,12 @@
+  * Useful for holding code to do something appropriate
+  * after a kernel panic.
+  */
++extern int allow_kcore_access;
+ static int __init setup_crashkernel(char *arg)
+ {
+ 	unsigned long size, base;
+ 	char *p;
++	allow_kcore_access = 1; /*enable ability to read /proc/kcore*/
+ 	if (!arg)
+ 		return -EINVAL;
+ 	size = memparse(arg, &p);