rpms/kernel/devel kernel.spec, 1.232, 1.233 linux-2.6-default-mmf_dump_elf_headers.patch, 1.1, 1.2 linux-2.6-add-mmf_dump_elf_headers.patch, 1.1, NONE linux-2.6-pass-g-to-assembler-under-config_debug_info.patch, 1.1, NONE linux-2.6-powerpc-lparmap-g.patch, 1.3, NONE linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch, 1.4, NONE

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	kernel.spec linux-2.6-default-mmf_dump_elf_headers.patch 
Removed Files:
	linux-2.6-add-mmf_dump_elf_headers.patch 
	linux-2.6-pass-g-to-assembler-under-config_debug_info.patch 
	linux-2.6-powerpc-lparmap-g.patch 
	linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch 
Log Message:
Clean out vdso patches merged upstream


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kernel.spec	7 Nov 2007 22:29:33 -0000	1.232
+++ kernel.spec	9 Nov 2007 01:06:27 -0000	1.233
@@ -341,7 +341,7 @@
 
 %if %{nopatches}
 # XXX temporary until last vdso patches are upstream
-%define vdso_arches %{nil}
+%define vdso_arches ppc ppc64
 %endif
 
 %if %{nopatches}%{using_upstream_branch}
@@ -614,14 +614,10 @@
 Patch701: linux-2.6-drivers-ssb-debug-revision.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
-Patch1100: linux-2.6-add-mmf_dump_elf_headers.patch
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1103: linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
-Patch1105: linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
 Patch1106: linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
 Patch1107: linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
-Patch1108: linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
-Patch1109: linux-2.6-powerpc-lparmap-g.patch
 Patch1200: linux-2.6-ps3-gelic-wireless.patch
 Patch1210: linux-2.6-ps3-storage-alias.patch
 Patch1220: linux-2.6-ps3-legacy-bootloader-hack.patch
@@ -1104,14 +1100,10 @@
 fi
 
 # build id related enhancements
-#ApplyPatch linux-2.6-add-mmf_dump_elf_headers.patch
-#ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
+ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 #ApplyPatch linux-2.6-i386-vdso-install-unstripped-copies-on-disk.patch
-#ApplyPatch linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch
 #ApplyPatch linux-2.6-x86_64-ia32-vdso-install-unstripped-copies-on-disk.patch
 #ApplyPatch linux-2.6-x86_64-vdso-install-unstripped-copies-on-disk.patch
-#ApplyPatch linux-2.6-pass-g-to-assembler-under-config_debug_info.patch
-#ApplyPatch linux-2.6-powerpc-lparmap-g.patch
 
 # http://www.lirc.org/
 #ApplyPatch linux-2.6-lirc.patch
@@ -1673,12 +1665,12 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
-#                    ____ _____ ___  ____  _ 
+#                    ____ _____ ___  ____  _
 #                   / ___|_   _/ _ \|  _ \| |
 #                   \___ \ | || | | | |_) | |
 #                    ___) || || |_| |  __/|_|
 #                   |____/ |_| \___/|_|   (_)
-#                           
+#
 # Builds to rawhide aren't happening yet, so if you're committing here,
 # you're probably committing to the wrong place.
 # Checkout F-8/ and commit there.

linux-2.6-default-mmf_dump_elf_headers.patch:

Index: linux-2.6-default-mmf_dump_elf_headers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-default-mmf_dump_elf_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-default-mmf_dump_elf_headers.patch	9 Aug 2007 09:23:39 -0000	1.1
+++ linux-2.6-default-mmf_dump_elf_headers.patch	9 Nov 2007 01:06:27 -0000	1.2
@@ -1,6 +1,6 @@
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -365,7 +365,8 @@ extern int get_dumpable(struct mm_struct
+@@ -373,7 +373,8 @@ extern int get_dumpable(struct mm_struct
  #define MMF_DUMP_FILTER_MASK \
  	(((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT)
  #define MMF_DUMP_FILTER_DEFAULT \
@@ -8,6 +8,5 @@
 +	((1 << MMF_DUMP_ANON_PRIVATE) |	(1 << MMF_DUMP_ANON_SHARED) | \
 +	 (1 << MMF_DUMP_ELF_HEADERS))
  
- struct mm_struct {
- 	struct vm_area_struct * mmap;		/* list of VMAs */
-
+ struct sighand_struct {
+ 	atomic_t		count;


--- linux-2.6-add-mmf_dump_elf_headers.patch DELETED ---


--- linux-2.6-pass-g-to-assembler-under-config_debug_info.patch DELETED ---


--- linux-2.6-powerpc-lparmap-g.patch DELETED ---


--- linux-2.6-powerpc-vdso-install-unstripped-copies-on-disk.patch DELETED ---