rpms/kernel/devel patch-2.6.13-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.216, 1.217 kernel-2.6.spec, 1.1536, 1.1537 linux-2.6.11-execshield-vdso.patch, 1.9, 1.10 linux-2.6.11-execshield.patch, 1.12, 1.13 linux-2.6.7-modsign-include.patch, 1.2, 1.3 sources, 1.160, 1.161 upstream, 1.147, 1.148
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 5 21:23:03 UTC 2005
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23617
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6.11-execshield-vdso.patch
linux-2.6.11-execshield.patch
linux-2.6.7-modsign-include.patch sources upstream
Added Files:
patch-2.6.13-git5.bz2.sign
Log Message:
git5
--- NEW FILE patch-2.6.13-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBDHCCNyGugalF9Dw4RAty6AKCPaIsHlKt5DLD1bJMFNuP7BmiT9wCeK13k
Nb1y0Sig76R6HTtnMp/ryX8=
=JpOh
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- .cvsignore 4 Sep 2005 06:03:11 -0000 1.216
+++ .cvsignore 5 Sep 2005 21:22:59 -0000 1.217
@@ -10,3 +10,4 @@
patch-2.6.13-rc7-git3.bz2
patch-2.6.13-git3.bz2
patch-2.6.13-git4.bz2
+patch-2.6.13-git5.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1536
retrieving revision 1.1537
diff -u -r1.1536 -r1.1537
--- kernel-2.6.spec 4 Sep 2005 20:31:40 -0000 1.1536
+++ kernel-2.6.spec 5 Sep 2005 21:22:59 -0000 1.1537
@@ -216,7 +216,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.13-git4.bz2
+Patch1: patch-2.6.13-git5.bz2
#Patch2: patch-2.6.13-rc7-git3.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -1269,6 +1269,9 @@
%endif
%changelog
+* Mon Sep 05 2005 Dave Jones <davej at redhat.com>
+- 2.6.13-git5
+
* Sun Sep 04 2005 Dave Jones <davej at redhat.com>
- 2.6.13-git4
linux-2.6.11-execshield-vdso.patch:
linux-2.6.11/arch/i386/kernel/sysenter.c | 71 +++++++++++++++++------------
linux-2.6.11/fs/binfmt_elf.c | 17 ++----
linux-2.6.11/include/asm-i386/elf.h | 7 ++
linux-2.6.11/include/asm-i386/page.h | 5 ++
linux-2.6.11/include/linux/mm.h | 5 ++
linux-2.6.11/mm/mmap.c | 39 +++++++++++++++
linux-2.6.12/arch/i386/kernel/cpu/common.c | 7 ++
linux-2.6.13/fs/proc/task_mmu.c | 15 ++++--
8 files changed, 123 insertions(+), 43 deletions(-)
Index: linux-2.6.11-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield-vdso.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6.11-execshield-vdso.patch 6 Aug 2005 16:40:15 -0000 1.9
+++ linux-2.6.11-execshield-vdso.patch 5 Sep 2005 21:22:59 -0000 1.10
@@ -270,18 +270,16 @@
Ingo
-Index: linux/fs/proc/task_mmu.c
-===================================================================
---- linux.orig/fs/proc/task_mmu.c
-+++ linux/fs/proc/task_mmu.c
-@@ -142,14 +142,19 @@ static int show_map(struct seq_file *m,
- if (map->vm_end == mm->brk) {
+--- linux-2.6.13/fs/proc/task_mmu.c~ 2005-09-05 17:01:33.000000000 -0400
++++ linux-2.6.13/fs/proc/task_mmu.c 2005-09-05 17:16:36.000000000 -0400
+@@ -156,14 +156,19 @@ static int show_map_internal(struct seq_
+ if (vma->vm_end == mm->brk) {
pad_len_spaces(m, len);
seq_puts(m, "[heap]");
- } else {
-- if (map->vm_start <= mm->start_stack &&
+- if (vma->vm_start <= mm->start_stack &&
+ } else if (map->vm_start <= mm->start_stack &&
- map->vm_end >= mm->start_stack) {
+ vma->vm_end >= mm->start_stack) {
- pad_len_spaces(m, len);
- seq_puts(m, "[stack]");
@@ -291,7 +289,7 @@
+ }
+#ifdef __i386__
+ else if (map->vm_start ==
-+ (unsigned long)mm->context.vdso) {
++ (unsigned long)mm->context.vdso) {
+ pad_len_spaces(m, len);
+ seq_puts(m, "[vdso]");
}
@@ -299,4 +297,3 @@
} else {
pad_len_spaces(m, len);
seq_puts(m, "[vdso]");
-
linux-2.6.11-execshield.patch:
linux-2.6.11/arch/i386/kernel/traps.c | 111 ++++++++++++++++-------
linux-2.6.11/arch/x86_64/mm/fault.c | 2
linux-2.6.12/include/asm-x86_64/processor.h | 5 +
linux-2.6.12/mm/mmap.c | 2
linux-2.6.13/fs/proc/base.c | 4
linux-2.6.13/fs/proc/task_mmu.c | 3
linux-810/arch/i386/kernel/asm-offsets.c | 1
linux-810/arch/i386/kernel/entry.S | 8 +
linux-810/arch/i386/kernel/process.c | 59 ++++++++++++
linux-810/arch/i386/kernel/signal.c | 4
linux-810/arch/i386/kernel/smp.c | 3
linux-810/arch/i386/kernel/sysenter.c | 55 +++++++++++
linux-810/arch/i386/kernel/traps.c | 48 +++++++++-
linux-810/arch/i386/kernel/vsyscall-sysenter.S | 6 -
linux-810/arch/i386/kernel/vsyscall.lds.S | 4
linux-810/arch/i386/mm/init.c | 6 +
linux-810/arch/i386/mm/mmap.c | 6 -
linux-810/arch/ia64/ia32/binfmt_elf32.c | 2
linux-810/arch/x86_64/ia32/ia32_binfmt.c | 2
linux-810/arch/x86_64/kernel/process.c | 7 -
linux-810/arch/x86_64/mm/Makefile | 2
linux-810/arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++
linux-810/drivers/char/random.c | 7 +
linux-810/fs/binfmt_elf.c | 120 ++++++++++++++++++++-----
linux-810/fs/proc/array.c | 8 +
linux-810/fs/proc/task_mmu.c | 22 +++-
linux-810/include/asm-i386/desc.h | 14 ++
linux-810/include/asm-i386/elf.h | 42 +++++---
linux-810/include/asm-i386/mmu.h | 6 +
linux-810/include/asm-i386/pgalloc.h | 1
linux-810/include/asm-i386/processor.h | 8 +
linux-810/include/asm-i386/thread_info.h | 1
linux-810/include/asm-ia64/pgalloc.h | 4
linux-810/include/asm-ppc/pgalloc.h | 5 +
linux-810/include/asm-ppc64/pgalloc.h | 5 +
linux-810/include/asm-s390/pgalloc.h | 4
linux-810/include/asm-sparc/pgalloc.h | 4
linux-810/include/asm-sparc64/pgalloc.h | 4
linux-810/include/asm-x86_64/pgalloc.h | 7 +
linux-810/include/linux/mm.h | 9 +
linux-810/include/linux/resource.h | 5 -
linux-810/include/linux/sched.h | 9 +
linux-810/include/linux/sysctl.h | 3
linux-810/kernel/signal.c | 38 +++++++
linux-810/kernel/sysctl.c | 39 ++++++++
linux-810/mm/fremap.c | 10 +-
linux-810/mm/mmap.c | 105 ++++++++++++++++++++-
linux-810/mm/mprotect.c | 5 -
linux-810/mm/mremap.c | 4
49 files changed, 801 insertions(+), 123 deletions(-)
Index: linux-2.6.11-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6.11-execshield.patch 7 Jul 2005 19:22:46 -0000 1.12
+++ linux-2.6.11-execshield.patch 5 Sep 2005 21:22:59 -0000 1.13
@@ -834,27 +834,26 @@
if (!whole) {
min_flt = task->min_flt;
maj_flt = task->maj_flt;
-diff -urNp --exclude-from=/home/davej/.exclude linux-801/fs/proc/base.c linux-810/fs/proc/base.c
---- linux-801/fs/proc/base.c
-+++ linux-810/fs/proc/base.c
-@@ -143,7 +143,7 @@ static struct pid_entry tgid_base_stuff[
+--- linux-2.6.13/fs/proc/base.c~ 2005-09-05 16:56:55.000000000 -0400
++++ linux-2.6.13/fs/proc/base.c 2005-09-05 16:57:44.000000000 -0400
+@@ -181,7 +181,7 @@ static struct pid_entry tgid_base_stuff[
E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO),
E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO),
E(PROC_TGID_STATM, "statm", S_IFREG|S_IRUGO),
- E(PROC_TGID_MAPS, "maps", S_IFREG|S_IRUGO),
+ E(PROC_TGID_MAPS, "maps", S_IFREG|S_IRUSR),
- E(PROC_TGID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR),
- #ifdef CONFIG_SECCOMP
- E(PROC_TGID_SECCOMP, "seccomp", S_IFREG|S_IRUSR|S_IWUSR),
-@@ -179,7 +179,7 @@ static struct pid_entry tid_base_stuff[]
+ #ifdef CONFIG_NUMA
+ E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO),
+ #endif
+@@ -221,7 +221,7 @@ static struct pid_entry tid_base_stuff[]
E(PROC_TID_CMDLINE, "cmdline", S_IFREG|S_IRUGO),
E(PROC_TID_STAT, "stat", S_IFREG|S_IRUGO),
E(PROC_TID_STATM, "statm", S_IFREG|S_IRUGO),
- E(PROC_TID_MAPS, "maps", S_IFREG|S_IRUGO),
+ E(PROC_TID_MAPS, "maps", S_IFREG|S_IRUSR),
- E(PROC_TID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR),
- #ifdef CONFIG_SECCOMP
- E(PROC_TID_SECCOMP, "seccomp", S_IFREG|S_IRUSR|S_IWUSR),
+ #ifdef CONFIG_NUMA
+ E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO),
+ #endif
diff -urNp --exclude-from=/home/davej/.exclude linux-801/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c
--- linux-801/fs/proc/task_mmu.c
+++ linux-810/fs/proc/task_mmu.c
@@ -899,13 +898,15 @@
flags & VM_MAYSHARE ? 's' : 'p',
map->vm_pgoff << PAGE_SHIFT,
MAJOR(dev), MINOR(dev), ino, &len);
-@@ -121,8 +137,7 @@ static int show_map(struct seq_file *m,
- seq_path(m, file->f_vfsmnt, file->f_dentry, "");
+--- linux-2.6.13/fs/proc/task_mmu.c~ 2005-09-05 16:59:05.000000000 -0400
++++ linux-2.6.13/fs/proc/task_mmu.c 2005-09-05 17:00:13.000000000 -0400
+@@ -153,8 +153,7 @@ static int show_map_internal(struct seq_
+ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n");
} else {
if (mm) {
-- if (map->vm_start <= mm->start_brk &&
-- map->vm_end >= mm->brk) {
-+ if (map->vm_end == mm->brk) {
+- if (vma->vm_start <= mm->start_brk &&
+- vma->vm_end >= mm->brk) {
++ if (vma->vm_end == mm->brk) {
pad_len_spaces(m, len);
seq_puts(m, "[heap]");
} else {
linux-2.6.7-modsign-include.patch:
linux-2.6.13/include/asm-mips/module.h | 13 ++++++++++---
linux-905/include/asm-alpha/module.h | 3 +++
linux-905/include/asm-arm/module.h | 5 +++++
linux-905/include/asm-cris/module.h | 5 +++++
linux-905/include/asm-h8300/module.h | 5 +++++
linux-905/include/asm-i386/module.h | 5 +++++
linux-905/include/asm-ia64/module.h | 5 +++++
linux-905/include/asm-m32r/module.h | 5 +++++
linux-905/include/asm-m68k/module.h | 5 +++++
linux-905/include/asm-parisc/module.h | 8 ++++++++
linux-905/include/asm-ppc/module.h | 5 +++++
linux-905/include/asm-ppc64/module.h | 5 +++++
linux-905/include/asm-s390/module.h | 3 +++
linux-905/include/asm-sh/module.h | 5 +++++
linux-905/include/asm-sparc/module.h | 5 +++++
linux-905/include/asm-sparc64/module.h | 5 +++++
linux-905/include/asm-um/module-i386.h | 4 ++++
linux-905/include/asm-v850/module.h | 5 +++++
linux-905/include/asm-x86_64/module.h | 5 +++++
19 files changed, 98 insertions(+), 3 deletions(-)
Index: linux-2.6.7-modsign-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.7-modsign-include.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.7-modsign-include.patch 22 Mar 2005 07:00:21 -0000 1.2
+++ linux-2.6.7-modsign-include.patch 5 Sep 2005 21:22:59 -0000 1.3
@@ -140,13 +140,14 @@
+#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif /* _ASM_M68K_MODULE_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-mips/module.h linux-905/include/asm-mips/module.h
---- linux-904/include/asm-mips/module.h
-+++ linux-905/include/asm-mips/module.h
-@@ -27,17 +27,27 @@ typedef struct
-
- #ifdef CONFIG_MIPS32
+
+--- linux-2.6.13/include/asm-mips/module.h~ 2005-09-05 17:18:22.000000000 -0400
++++ linux-2.6.13/include/asm-mips/module.h 2005-09-05 17:20:33.000000000 -0400
+@@ -26,19 +26,26 @@ typedef struct
+ } Elf64_Mips_Rela;
+ #ifdef CONFIG_32BIT
+-
+#define MODULES_ARE_ELF32
#define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym
@@ -158,19 +159,20 @@
#endif
- #ifdef CONFIG_MIPS64
-
+ #ifdef CONFIG_64BIT
+-
+#define MODULES_ARE_ELF64
#define Elf_Shdr Elf64_Shdr
#define Elf_Sym Elf64_Sym
#define Elf_Ehdr Elf64_Ehdr
+-
+#define Elf_Rel Elf64_Rel
+#define Elf_Rela Elf64_Rela
+#define ELF_R_TYPE(X) ELF64_R_TYPE(X)
+#define ELF_R_SYM(X) ELF64_R_SYM(X)
-
#endif
+ #ifdef CONFIG_MODULES
diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h
--- linux-904/include/asm-parisc/module.h
+++ linux-905/include/asm-parisc/module.h
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- sources 4 Sep 2005 20:31:41 -0000 1.160
+++ sources 5 Sep 2005 21:22:59 -0000 1.161
@@ -1,2 +1,3 @@
560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2
ff6813495c14019f104f99828713c2a1 patch-2.6.13-git4.bz2
+a8af6dc7c0f9846041686f9f10cfa211 patch-2.6.13-git5.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- upstream 4 Sep 2005 06:03:27 -0000 1.147
+++ upstream 5 Sep 2005 21:22:59 -0000 1.148
@@ -1,2 +1,3 @@
linux-2.6.13.tar.bz2
-patch-2.6.13-git4.bz2
+patch-2.6.13-git5.bz2
+
More information about the fedora-cvs-commits
mailing list