[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/kernel/devel .cvsignore, 1.261, 1.262 kernel-2.6.spec, 1.1633, 1.1634 linux-2.6-execshield.patch, 1.1, 1.2 linux-2.6-modsign-include.patch, 1.1, 1.2 linux-2.6-netdump.patch, 1.1, 1.2 linux-2.6-scsi-advansys-pcitable.patch, 1.1, 1.2 sources, 1.203, 1.204 upstream, 1.189, 1.190
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/kernel/devel .cvsignore, 1.261, 1.262 kernel-2.6.spec, 1.1633, 1.1634 linux-2.6-execshield.patch, 1.1, 1.2 linux-2.6-modsign-include.patch, 1.1, 1.2 linux-2.6-netdump.patch, 1.1, 1.2 linux-2.6-scsi-advansys-pcitable.patch, 1.1, 1.2 sources, 1.203, 1.204 upstream, 1.189, 1.190
- Date: Sun, 30 Oct 2005 22:03:31 -0500
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32248
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-execshield.patch
linux-2.6-modsign-include.patch linux-2.6-netdump.patch
linux-2.6-scsi-advansys-pcitable.patch sources upstream
Log Message:
Blood! Guts! Gore! -git2 !
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- .cvsignore 28 Oct 2005 01:55:23 -0000 1.261
+++ .cvsignore 31 Oct 2005 03:03:26 -0000 1.262
@@ -2,5 +2,4 @@
temp-*
kernel-2.6.14
linux-2.6.14.tar.bz2
-patch-2.6.14-rc5.bz2
-patch-2.6.14-rc5-git7.bz2
+patch-2.6.14-git2.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1633
retrieving revision 1.1634
diff -u -r1.1633 -r1.1634
--- kernel-2.6.spec 28 Oct 2005 05:03:41 -0000 1.1633
+++ kernel-2.6.spec 31 Oct 2005 03:03:26 -0000 1.1634
@@ -198,7 +198,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.14-rc5.bz2
+Patch1: patch-2.6.14-git2.bz2
Patch2: patch-2.6.14-rc5-git7.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -548,7 +548,7 @@
cd linux-%{kversion}
# Update to latest upstream.
-#%patch1 -p1
+%patch1 -p1
#%patch2 -p1
#
@@ -1266,6 +1266,9 @@
%endif
%changelog
+* Sun Oct 30 2005 Dave Jones <davej redhat com>
+- 2.6.14-git2
+
* Thu Oct 27 2005 Dave Jones <davej redhat com>
- 2.6.14
linux-2.6-execshield.patch:
linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c | 4
linux-2.6.13-a/arch/x86_64/kernel/process.c | 6 -
linux-2.6.13-a/arch/x86_64/kernel/setup64.c | 25 -----
linux-2.6.13-a/include/asm-x86_64/pgtable.h | 2
linux-2.6.13/mm/fremap.c | 16 +--
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 | 93 ++++++++++++++++++-
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/fault.c | 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/base.c | 4
linux-810/fs/proc/task_mmu.c | 25 ++++-
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/asm-x86_64/processor.h | 5 +
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/mmap.c | 105 ++++++++++++++++++++-
linux-810/mm/mprotect.c | 5 -
linux-810/mm/mremap.c | 4
linux-813/arch/i386/kernel/cpu/common.c | 7 +
51 files changed, 780 insertions(+), 126 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-execshield.patch 15 Oct 2005 01:02:15 -0000 1.1
+++ linux-2.6-execshield.patch 31 Oct 2005 03:03:27 -0000 1.2
@@ -923,7 +923,7 @@
diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c
--- linux-804/fs/proc/task_mmu.c
+++ linux-810/fs/proc/task_mmu.c
-@@ -26,13 +26,23 @@ char *task_mem(struct mm_struct *mm, cha
+@@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
@@ -933,9 +933,11 @@
+ "Brk:\t%08lx kB\n"
+ "StaStk:\t%08lx kB\n"
+ ,
- (mm->total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
+ hiwater_vm << (PAGE_SHIFT-10),
+ (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
mm->locked_vm << (PAGE_SHIFT-10),
- get_mm_counter(mm, rss) << (PAGE_SHIFT-10),
+@@ -51,7 +55,13 @@ char *task_mem(struct mm_struct *mm, cha
+ total_rss << (PAGE_SHIFT-10),
data << (PAGE_SHIFT-10),
mm->stack_vm << (PAGE_SHIFT-10), text, lib,
- (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
@@ -944,7 +946,7 @@
+#ifdef __i386__
+ if (!nx_enabled)
+ buffer += sprintf(buffer,
-+ "ExecLim:\t%08lx\n", mm->context.exec_limit);
++ "ExecLim:\t%08lx\n", mm->context.exec_limit);
+#endif
return buffer;
}
@@ -1466,29 +1468,29 @@
.data = &core_uses_pid,
--- linux-2.6.13/mm/fremap.c~ 2005-10-13 17:34:08.000000000 -0400
+++ linux-2.6.13/mm/fremap.c 2005-10-13 17:34:58.000000000 -0400
-@@ -85,13 +85,15 @@ int install_page(struct mm_struct *mm, s
+@@ -83,13 +83,15 @@ int install_page(struct mm_struct *mm, s
* caller about it.
*/
err = -EINVAL;
- inode = vma->vm_file->f_mapping->host;
- size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
- if (!page->mapping || page->index >= size)
-- goto err_unlock;
+- goto unlock;
- err = -ENOMEM;
- if (page_mapcount(page) > INT_MAX/2)
-- goto err_unlock;
+- goto unlock;
+ if (vma->vm_file) {
+ inode = vma->vm_file->f_mapping->host;
+ size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+ if (!page->mapping || page->index >= size)
-+ goto err_unlock;
++ goto unlock;
+ err = -ENOMEM;
+ if (page_mapcount(page) > INT_MAX/2)
-+ goto err_unlock;
++ goto unlock;
+ }
- zap_pte(mm, vma, addr, pte);
-
+ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
+ inc_mm_counter(mm, file_rss);
diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mmap.c linux-810/mm/mmap.c
--- linux-804/mm/mmap.c
+++ linux-810/mm/mmap.c
@@ -1675,14 +1677,14 @@
vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
return 0;
-@@ -1960,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm)
- set_mm_counter(mm, rss, 0);
- mm->total_vm = 0;
- mm->locked_vm = 0;
+@@ -2048,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm)
+ vm_unacct_memory(nr_accounted);
+ free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0);
+ tlb_finish_mmu(tlb, 0, end);
+ arch_flush_exec_range(mm);
- spin_unlock(&mm->page_table_lock);
-
+ /*
+ * Walk the list again, actually closing and freeing it,
diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mprotect.c linux-810/mm/mprotect.c
--- linux-804/mm/mprotect.c
+++ linux-810/mm/mprotect.c
linux-2.6-modsign-include.patch:
linux-2.6.13/include/asm-powerpc/module.h | 10 ++++++++++
linux-2.6.14/include/asm-mips/module.h | 12 ++++++++++--
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-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 +++++
18 files changed, 98 insertions(+), 2 deletions(-)
Index: linux-2.6-modsign-include.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-include.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-modsign-include.patch 16 Oct 2005 22:23:45 -0000 1.1
+++ linux-2.6-modsign-include.patch 31 Oct 2005 03:03:28 -0000 1.2
@@ -141,9 +141,9 @@
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
#endif /* _ASM_M68K_MODULE_H */
---- 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
+--- linux-2.6.14/include/asm-mips/module.h~ 2005-10-30 21:31:42.000000000 -0500
++++ linux-2.6.14/include/asm-mips/module.h 2005-10-30 21:33:30.000000000 -0500
+@@ -34,11 +34,15 @@ typedef struct {
} Elf64_Mips_Rela;
#ifdef CONFIG_32BIT
@@ -152,11 +152,15 @@
#define Elf_Shdr Elf32_Shdr
#define Elf_Sym Elf32_Sym
#define Elf_Ehdr Elf32_Ehdr
+ #define Elf_Addr Elf32_Addr
+#define Elf_Rel Elf32_Rel
+#define Elf_Rela Elf32_Rela
+#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
+#define ELF_R_SYM(X) ELF32_R_SYM(X)
+ #define Elf_Mips_Rel Elf32_Rel
+ #define Elf_Mips_Rela Elf32_Rela
+@@ -49,11 +53,15 @@ typedef struct {
#endif
#ifdef CONFIG_64BIT
@@ -165,14 +169,14 @@
#define Elf_Shdr Elf64_Shdr
#define Elf_Sym Elf64_Sym
#define Elf_Ehdr Elf64_Ehdr
--
+ #define Elf_Addr Elf64_Addr
+#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
+ #define Elf_Mips_Rel Elf64_Mips_Rel
+ #define Elf_Mips_Rela Elf64_Mips_Rela
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
linux-2.6-netdump.patch:
linux-2.6.12/drivers/net/Kconfig | 7
linux-2.6.12/drivers/net/netdump.c | 550 +++++++++++++++++++++++++++++
linux-2.6.12/drivers/net/netdump.h | 90 ++++
linux-2.6.12/include/asm-generic/netdump.h | 48 ++
linux-2.6.12/include/asm-i386/netdump.h | 79 ++++
linux-2.6.12/include/asm-ia64/netdump.h | 82 ++++
linux-2.6.12/include/asm-ppc64/netdump.h | 79 ++++
linux-2.6.12/include/asm-s390/netdump.h | 6
linux-2.6.12/include/asm-x86_64/netdump.h | 79 ++++
linux-2.6.12/include/linux/netdevice.h | 8
linux-2.6.12/include/linux/netpoll.h | 4
linux-2.6.12/net/core/netpoll.c | 17
linux-2.6.14/drivers/net/Makefile | 1
13 files changed, 1039 insertions(+), 11 deletions(-)
Index: linux-2.6-netdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-netdump.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-netdump.patch 24 Aug 2005 18:42:15 -0000 1.1
+++ linux-2.6-netdump.patch 31 Oct 2005 03:03:28 -0000 1.2
@@ -660,13 +660,16 @@
endif #NETDEVICES
config NETPOLL
---- linux-2.6.12/drivers/net/Makefile.netdump.orig 2005-08-19 17:45:43.053483367 -0400
-+++ linux-2.6.12/drivers/net/Makefile 2005-08-19 17:47:33.025203810 -0400
-@@ -195,3 +195,4 @@ obj-$(CONFIG_IRDA) += irda/
+--- linux-2.6.14/drivers/net/Makefile~ 2005-10-30 21:44:17.000000000 -0500
++++ linux-2.6.14/drivers/net/Makefile 2005-10-30 21:44:33.000000000 -0500
+@@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_NETCONSOLE) += netconsole.o
+obj-$(CONFIG_NETDUMP) += netdump.o
+
+ obj-$(CONFIG_FS_ENET) += fs_enet/
+
--- linux-2.6.12/net/core/netpoll.c.netdump.orig 2005-08-19 17:46:01.104483015 -0400
+++ linux-2.6.12/net/core/netpoll.c 2005-08-19 17:47:33.034202314 -0400
@@ -20,10 +20,12 @@
linux-2.6-scsi-advansys-pcitable.patch:
drivers/scsi/advansys.c | 82 +++++++++++++++++------------------
linux-2.6.14/include/linux/pci_ids.h | 7 ++
2 files changed, 48 insertions(+), 41 deletions(-)
Index: linux-2.6-scsi-advansys-pcitable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-scsi-advansys-pcitable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-scsi-advansys-pcitable.patch 15 Oct 2005 01:14:29 -0000 1.1
+++ linux-2.6-scsi-advansys-pcitable.patch 31 Oct 2005 03:03:28 -0000 1.2
@@ -1,21 +1,21 @@
Remove a lot of duplicate #defines from the advansys driver.
---- linux-2.6.12/include/linux/pci_ids.h~ 2005-07-05 23:18:13.000000000 -0400
-+++ linux-2.6.12/include/linux/pci_ids.h 2005-07-05 23:30:02.000000000 -0400
-@@ -1101,9 +1101,12 @@
- #define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS 0x0083
+--- linux-2.6.14/include/linux/pci_ids.h~ 2005-10-30 21:36:21.000000000 -0500
++++ linux-2.6.14/include/linux/pci_ids.h 2005-10-30 21:37:16.000000000 -0500
+@@ -949,6 +949,13 @@
+ #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
+ #define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
- #define PCI_VENDOR_ID_ASP 0x10cd
++#define PCI_VENDOR_ID_ASP 0x10cd
+#define PCI_DEVICE_ID_ASP_1200A 0x1100
- #define PCI_DEVICE_ID_ASP_ABP940 0x1200
- #define PCI_DEVICE_ID_ASP_ABP940U 0x1300
- #define PCI_DEVICE_ID_ASP_ABP940UW 0x2300
++#define PCI_DEVICE_ID_ASP_ABP940 0x1200
++#define PCI_DEVICE_ID_ASP_ABP940U 0x1300
++#define PCI_DEVICE_ID_ASP_ABP940UW 0x2300
+#define PCI_DEVICE_ID_38C0800_REV1 0x2500
+#define PCI_DEVICE_ID_38C1600_REV1 0x2700
- #define PCI_VENDOR_ID_MACRONIX 0x10d9
- #define PCI_DEVICE_ID_MACRONIX_MX98713 0x0512
-
+ #define PCI_VENDOR_ID_TCONRAD 0x10da
+ #define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508
--- vanilla/drivers/scsi/advansys.c 2005-06-17 15:48:29.000000000 -0400
+++ linux-2.6.12/drivers/scsi/advansys.c 2005-07-05 23:27:48.000000000 -0400
@@ -889,10 +889,6 @@ typedef unsigned char uchar;
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- sources 28 Oct 2005 01:55:23 -0000 1.203
+++ sources 31 Oct 2005 03:03:28 -0000 1.204
@@ -1,3 +1,2 @@
66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2
-556b3ad322a1466ccbf6c6d0a8db3a3d patch-2.6.14-rc5.bz2
-5c6088472b098a36ac5246fa8fd73700 patch-2.6.14-rc5-git7.bz2
+3db58f38e8a3c001d1a18eb1ee27db3b patch-2.6.14-git2.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- upstream 27 Oct 2005 17:01:53 -0000 1.189
+++ upstream 31 Oct 2005 03:03:28 -0000 1.190
@@ -1,3 +1,2 @@
-linux-2.6.13.tar.bz2
-patch-2.6.14-rc5.bz2
-patch-2.6.14-rc5-git7.bz2
+linux-2.6.14.tar.bz2
+patch-2.6.14-git2.bz2
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]