rpms/kernel/devel patch-2.6.32-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.1129, 1.1130 kernel.spec, 1.1812, 1.1813 linux-2.6-crash-driver.patch, 1.15, 1.16 sources, 1.1087, 1.1088 upstream, 1.1001, 1.1002 patch-2.6.31-git18.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Sep 28 23:50:53 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1919
Modified Files:
.cvsignore kernel.spec linux-2.6-crash-driver.patch sources
upstream
Added Files:
patch-2.6.32-rc1.bz2.sign
Removed Files:
patch-2.6.31-git18.bz2.sign
Log Message:
* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.32-rc1
- rebased crash-driver patchset, ia64_ksyms.c conflicts. move x86 crash.h
file to the right place.
- full changelog forthcoming & to fedora-kernel-list.
--- NEW FILE patch-2.6.32-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKv+bByGugalF9Dw4RAklMAKCKD4wOVPC0iK6cRAEFFavNILKY1QCfXo4o
UrAmA57sdC4SMI48GbHN+fw=
=aLuQ
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -p -r1.1129 -r1.1130
--- .cvsignore 28 Sep 2009 05:09:48 -0000 1.1129
+++ .cvsignore 28 Sep 2009 23:50:51 -0000 1.1130
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.31
linux-2.6.31.tar.bz2
-patch-2.6.31-git18.bz2
+patch-2.6.32-rc1.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1812
retrieving revision 1.1813
diff -u -p -r1.1812 -r1.1813
--- kernel.spec 28 Sep 2009 22:57:23 -0000 1.1812
+++ kernel.spec 28 Sep 2009 23:50:52 -0000 1.1813
@@ -59,9 +59,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 0
+%define rcrev 1
# The git snapshot level
-%define gitrev 18
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1986,6 +1986,12 @@ fi
%changelog
* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.32-rc1
+- rebased crash-driver patchset, ia64_ksyms.c conflicts. move x86 crash.h
+ file to the right place.
+- full changelog forthcoming & to fedora-kernel-list.
+
+* Mon Sep 28 2009 Kyle McMartin <kyle at redhat.com>
- sick of rejects.
* Mon Sep 28 2009 Chuck Ebbert <cebbert at redhat.com>
linux-2.6-crash-driver.patch:
arch/ia64/include/asm/crash.h | 90 +++++++++++++++++++++++++++++
arch/ia64/kernel/ia64_ksyms.c | 3
arch/x86/include/asm/crash.h | 75 ++++++++++++++++++++++++
arch/x86/mm/ioremap.c | 1
drivers/char/Kconfig | 2
drivers/char/Makefile | 2
drivers/char/crash.c | 128 ++++++++++++++++++++++++++++++++++++++++++
7 files changed, 301 insertions(+)
Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- linux-2.6-crash-driver.patch 9 Apr 2009 14:04:41 -0000 1.15
+++ linux-2.6-crash-driver.patch 28 Sep 2009 23:50:52 -0000 1.16
@@ -95,24 +95,105 @@ index 0000000..541af84
+
+#endif /* _ASM_IA64_CRASH_H */
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 6da1f20..2984fb3 100644
+index 14d39e3..cf3d040 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
-@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+@@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
#include <asm/unwind.h>
EXPORT_SYMBOL(unw_init_running);
+#include <linux/efi.h>
+EXPORT_SYMBOL_GPL(efi_mem_type);
+
- #ifdef ASM_SUPPORTED
- # ifdef CONFIG_SMP
- # if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+ #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
+ extern void esi_call_phys (void);
+ EXPORT_SYMBOL_GPL(esi_call_phys);
+diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/arch/x86/include/asm/crash.h
+@@ -0,0 +1,75 @@
++#ifndef _ASM_I386_CRASH_H
++#define _ASM_I386_CRASH_H
++
++/*
++ * linux/include/asm-i386/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_I386_CRASH_H */
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index d4c4307..d1c968f 100644
+index 334e63c..8e1ccbc 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
-@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+@@ -60,6 +60,7 @@ int page_is_ram(unsigned long pagenr)
}
return 0;
}
@@ -121,10 +202,10 @@ index d4c4307..d1c968f 100644
/*
* Fix up the linear direct mapping of the kernel to avoid cache attribute
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 43d6ba8..0d81c9a 100644
+index 08a6f50..8bc5e9a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -460,6 +460,8 @@ config LEGACY_PTYS
+@@ -484,6 +484,8 @@ config LEGACY_PTYS
security. This option enables these legacy devices; on most
systems, it is safe to say N.
@@ -134,10 +215,10 @@ index 43d6ba8..0d81c9a 100644
config LEGACY_PTY_COUNT
int "Maximum number of legacy PTY in use"
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 438f713..1b7767b 100644
+index 19a79dd..0bee860 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o
+@@ -112,6 +112,8 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
@@ -280,84 +361,3 @@ index 0000000..e5437de
+module_exit(crash_cleanup_module);
+
+MODULE_LICENSE("GPL");
-diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
-new file mode 100644
-index 0000000..dfcc006
---- /dev/null
-+++ b/include/asm-x86/crash.h
-@@ -0,0 +1,75 @@
-+#ifndef _ASM_I386_CRASH_H
-+#define _ASM_I386_CRASH_H
-+
-+/*
-+ * linux/include/asm-i386/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_I386_CRASH_H */
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -p -r1.1087 -r1.1088
--- sources 28 Sep 2009 05:09:49 -0000 1.1087
+++ sources 28 Sep 2009 23:50:52 -0000 1.1088
@@ -1,2 +1,2 @@
84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2
-53e607f1d8eab73b69d3ad6ebfd1bc71 patch-2.6.31-git18.bz2
+9485dc509d52494d3b323161ed8a6f64 patch-2.6.32-rc1.bz2.sign
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -p -r1.1001 -r1.1002
--- upstream 28 Sep 2009 05:09:49 -0000 1.1001
+++ upstream 28 Sep 2009 23:50:52 -0000 1.1002
@@ -1,2 +1,2 @@
linux-2.6.31.tar.bz2
-patch-2.6.31-git18.bz2
+patch-2.6.32-rc1.bz2
--- patch-2.6.31-git18.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list