rpms/kernel/devel .cvsignore, 1.559, 1.560 kernel-2.6.spec, 1.2904, 1.2905 linux-2.6-compile-fixes.patch, 1.129, 1.130 linux-2.6-execshield.patch, 1.46, 1.47 sources, 1.522, 1.523 upstream, 1.450, 1.451
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jan 6 18:20:18 UTC 2007
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17659
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-execshield.patch sources upstream
Log Message:
git4 (also move the execshield compile fix to execshield)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- .cvsignore 2 Jan 2007 04:31:26 -0000 1.559
+++ .cvsignore 6 Jan 2007 18:20:16 -0000 1.560
@@ -5,3 +5,4 @@
xen-11633.tar.bz2
linux-2.6.19.tar.bz2
patch-2.6.20-rc3.bz2
+patch-2.6.20-rc3-git4.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2904
retrieving revision 1.2905
diff -u -r1.2904 -r1.2905
--- kernel-2.6.spec 2 Jan 2007 04:31:26 -0000 1.2904
+++ kernel-2.6.spec 6 Jan 2007 18:20:16 -0000 1.2905
@@ -301,6 +301,7 @@
# Patches 0 through 100 are meant for core subsystem upgrades
#
Patch1: patch-2.6.20-rc3.bz2
+Patch2: patch-2.6.20-rc3-git4.bz2
Patch3: git-geode.patch
# Patches 10 through 99 are for things that are going upstream really soon.
@@ -772,6 +773,7 @@
# Update to latest upstream.
%patch1 -p1
+%patch2 -p1
# Patches 10 through 100 are meant for core subsystem upgrades
@@ -1988,6 +1990,9 @@
# - tux.
%changelog
+* Sat Jan 6 2007 Dave Jones <davej at redhat.com>
+- 2.6.20rc3-git4
+
* Mon Jan 1 2007 Dave Jones <davej at redhat.com>
- 2.6.20rc3
linux-2.6-compile-fixes.patch:
linux-2.6.19.noarch/drivers/macintosh/via-pmu.c | 1 +
linux-2.6.19.noarch/include/asm-powerpc/io.h | 1 +
linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++
3 files changed, 6 insertions(+)
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- linux-2.6-compile-fixes.patch 31 Dec 2006 19:42:34 -0000 1.129
+++ linux-2.6-compile-fixes.patch 6 Jan 2007 18:20:16 -0000 1.130
@@ -5,57 +5,6 @@
# to do a compile to figure out what your diff is fixing. Thanks.
#
-arch/i386/kernel/process.c: In function '__switch_to':
-arch/i386/kernel/process.c:645: error: implicit declaration of function 'load_user_cs_desc'
-arch/i386/kernel/process.c: In function 'arch_add_exec_range':
-arch/i386/kernel/process.c:915: error: implicit declaration of function 'set_user_cs'
-
---- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500
-+++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500
-@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
- return base;
- }
-
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+ limit = (limit - 1) / PAGE_SIZE;
-+ desc->a = limit & 0xffff;
-+ desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
-+#define load_user_cs_desc(cpu, mm) \
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-+
-+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+
- #else /* __ASSEMBLY__ */
-
- /*
-@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas
- shll $16, base; \
- movw idx*8+2(gdt), lo_w;
-
--static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
--{
-- limit = (limit - 1) / PAGE_SIZE;
-- desc->a = limit & 0xffff;
-- desc->b = (limit & 0xf0000) | 0x00c0fb00;
--}
--
--#define load_user_cs_desc(cpu, mm) \
-- get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
--
--extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
--extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
--extern void arch_flush_exec_range(struct mm_struct *mm);
--
- #endif /* !__ASSEMBLY__ */
-
- #endif
-
-
drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':
drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console'
drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices':
linux-2.6-execshield.patch:
linux-2.6.19.noarch/drivers/char/random.c | 8 +
linux-2.6.19.noarch/include/asm-i386/desc.h | 14 ++
linux-2.6/arch/i386/kernel/cpu/common.c | 7 +
linux-2.6/arch/i386/kernel/process.c | 59 +++++++++
linux-2.6/arch/i386/kernel/smp.c | 3
linux-2.6/arch/i386/kernel/sysenter.c | 6
linux-2.6/arch/i386/kernel/traps.c | 93 +++++++++++++-
linux-2.6/arch/i386/mm/init.c | 6
linux-2.6/arch/i386/mm/mmap.c | 6
linux-2.6/arch/i386/mm/pageattr.c | 8 +
linux-2.6/arch/ia64/ia32/binfmt_elf32.c | 2
linux-2.6/arch/powerpc/kernel/vdso.c | 3
linux-2.6/arch/x86_64/ia32/ia32_binfmt.c | 6
linux-2.6/arch/x86_64/ia32/syscall32.c | 4
linux-2.6/arch/x86_64/kernel/process.c | 6
linux-2.6/arch/x86_64/kernel/setup64.c | 40 ------
linux-2.6/arch/x86_64/mm/fault.c | 2
linux-2.6/arch/x86_64/mm/mmap.c | 98 +++++++++++---
linux-2.6/fs/binfmt_elf.c | 134 ++++++++++++++++----
linux-2.6/fs/proc/array.c | 8 -
linux-2.6/fs/proc/base.c | 8 -
linux-2.6/fs/proc/task_mmu.c | 29 +++-
linux-2.6/include/asm-i386/a.out.h | 2
linux-2.6/include/asm-i386/elf.h | 6
linux-2.6/include/asm-i386/mmu.h | 4
linux-2.6/include/asm-i386/page.h | 5
linux-2.6/include/asm-i386/pgalloc.h | 1
linux-2.6/include/asm-i386/processor.h | 8 +
linux-2.6/include/asm-ia64/pgalloc.h | 4
linux-2.6/include/asm-powerpc/elf.h | 3
linux-2.6/include/asm-powerpc/pgalloc.h | 5
linux-2.6/include/asm-ppc/pgalloc.h | 5
linux-2.6/include/asm-s390/pgalloc.h | 4
linux-2.6/include/asm-sparc/pgalloc.h | 4
linux-2.6/include/asm-sparc64/pgalloc.h | 4
linux-2.6/include/asm-x86_64/pgalloc.h | 7 +
linux-2.6/include/linux/mm.h | 16 ++
linux-2.6/include/linux/resource.h | 5
linux-2.6/include/linux/sched.h | 9 +
linux-2.6/include/linux/sysctl.h | 3
linux-2.6/kernel/signal.c | 33 +++++
linux-2.6/kernel/sysctl.c | 56 ++++++++
linux-2.6/mm/fremap.c | 16 +-
linux-2.6/mm/mmap.c | 183 ++++++++++++++++++++++++++--
linux-2.6/mm/mprotect.c | 6
linux-2.6/mm/mremap.c | 4
46 files changed, 798 insertions(+), 145 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- linux-2.6-execshield.patch 15 Dec 2006 15:19:56 -0000 1.46
+++ linux-2.6-execshield.patch 6 Jan 2007 18:20:16 -0000 1.47
@@ -1436,11 +1436,9 @@
#endif
-Index: linux-2.6/include/asm-i386/desc.h
-===================================================================
---- linux-2.6.orig/include/asm-i386/desc.h
-+++ linux-2.6/include/asm-i386/desc.h
-@@ -193,6 +193,20 @@ static inline unsigned long get_desc_bas
+--- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500
+@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
return base;
}
@@ -1458,9 +1456,9 @@
+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+extern void arch_flush_exec_range(struct mm_struct *mm);
+
- #endif /* !__ASSEMBLY__ */
+ #else /* __ASSEMBLY__ */
- #endif
+ /*
Index: linux-2.6/include/asm-i386/elf.h
===================================================================
--- linux-2.6.orig/include/asm-i386/elf.h
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- sources 2 Jan 2007 04:31:26 -0000 1.522
+++ sources 6 Jan 2007 18:20:16 -0000 1.523
@@ -1,3 +1,4 @@
93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2
443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2
69e8bfe3fbba5931833e7f6da51f6186 patch-2.6.20-rc3.bz2
+0ebd23abb7226d13533a9da9134bdc4c patch-2.6.20-rc3-git4.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- upstream 2 Jan 2007 04:31:26 -0000 1.450
+++ upstream 6 Jan 2007 18:20:16 -0000 1.451
@@ -1,2 +1,3 @@
linux-2.6.19.tar.bz2
patch-2.6.20-rc3.bz2
+patch-2.6.20-rc3-git4.bz2
More information about the fedora-cvs-commits
mailing list