rpms/kernel/devel kernel-2.6.spec, 1.3204, 1.3205 linux-2.6-modsign-include.patch, 1.6, 1.7 linux-2.6-proc-self-maps-fix.patch, 1.11, 1.12 linux-2.6-ppc64-no-apm.patch, 1.2, NONE

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-modsign-include.patch 
	linux-2.6-proc-self-maps-fix.patch 
Removed Files:
	linux-2.6-ppc64-no-apm.patch 
Log Message:
fix the git7 rebase


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3204
retrieving revision 1.3205
diff -u -r1.3204 -r1.3205
--- kernel-2.6.spec	4 Jun 2007 21:41:02 -0000	1.3204
+++ kernel-2.6.spec	4 Jun 2007 21:58:09 -0000	1.3205
@@ -381,7 +381,7 @@
 Source82: config-olpc-generic
 
 Patch00: patch-2.6.22-rc3.bz2
-Patch01: patch-2.6.22-rc3-git6.bz2
+Patch01: patch-2.6.22-rc3-git7.bz2
 Patch10: linux-2.6-utrace.patch
 Patch20: nouveau-drm.patch
 Patch30: linux-2.6-sysrq-c.patch
@@ -390,7 +390,6 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch90: linux-2.6-x86-dell-hpet.patch
 Patch100: linux-2.6-g5-therm-shutdown.patch
-Patch110: linux-2.6-ppc64-no-apm.patch
 Patch120: linux-2.6-ppc32-ucmpdi2.patch
 Patch130: linux-2.6-ibmvscsi-schizo.patch
 Patch140: linux-2.6-pmac-zilog.patch
@@ -861,12 +860,12 @@
 
 # Update to latest upstream.
 bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3.bz2 | patch -p1 -F1 -s
-bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3-git6.bz2 | patch -p1 -F1 -s
+bzcat $RPM_SOURCE_DIR/patch-2.6.22-rc3-git7.bz2 | patch -p1 -F1 -s
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-utrace.patch
+#ApplyPatch linux-2.6-utrace.patch
 
 # Nouveau DRM
 #ApplyPatch nouveau-drm.patch
@@ -895,8 +894,6 @@
 #
 # Alleviate G5 thermal shutdown problems
 ApplyPatch linux-2.6-g5-therm-shutdown.patch
-# Don't build APM emulation on PPC64.
-ApplyPatch linux-2.6-ppc64-no-apm.patch
 # Temporary hack to work around GCC PR #25724 / #21237
 ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 # Fix up ibmvscsi for combined pSeries/iSeries build

linux-2.6-modsign-include.patch:

Index: linux-2.6-modsign-include.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-modsign-include.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-modsign-include.patch	4 Jun 2007 21:38:14 -0000	1.6
+++ linux-2.6-modsign-include.patch	4 Jun 2007 21:58:09 -0000	1.7
@@ -160,21 +160,20 @@
  
  #endif /* _ASM_M32R_MODULE_H */
  
---- linux-2.6.21.noarch/include/asm-m68k/module.h~	2007-06-01 19:29:19.000000000 -0400
-+++ linux-2.6.21.noarch/include/asm-m68k/module.h	2007-06-01 19:30:02.000000000 -0400
-@@ -1,7 +1,12 @@
- #ifndef _ASM_M68K_MODULE_H
- #define _ASM_M68K_MODULE_H
- struct mod_arch_specific { };
-+#define MODULES_ARE_ELF32
- #define Elf_Shdr Elf32_Shdr
+--- linux-2.6.21.noarch/include/asm-m68k/module.h~	2007-06-04 17:54:52.000000000 -0400
++++ linux-2.6.21.noarch/include/asm-m68k/module.h	2007-06-04 17:55:12.000000000 -0400
+@@ -14,6 +14,11 @@ struct mod_arch_specific {
  #define Elf_Sym Elf32_Sym
  #define Elf_Ehdr Elf32_Ehdr
+ 
++#define MODULES_ARE_ELF32
 +#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)
- #endif /* _ASM_M68K_MODULE_H */
++#define ELF_R_TYPE(X) ELF32_R_TYPE(X)
++#define ELF_R_SYM(X)  ELF32_R_SYM(X)
+ 
+ enum m68k_fixup_type {
+ 	m68k_fixup_memoffset,
 diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h
 index 399d03f..694f979 100644
 --- a/include/asm-mips/module.h

linux-2.6-proc-self-maps-fix.patch:

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-proc-self-maps-fix.patch	15 Jan 2007 00:43:58 -0000	1.11
+++ linux-2.6-proc-self-maps-fix.patch	4 Jun 2007 21:58:09 -0000	1.12
@@ -1,17 +1,16 @@
 
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165351
 
-Index: linux-2.6/fs/proc/base.c
-===================================================================
---- linux-2.6.orig/fs/proc/base.c
-+++ linux-2.6/fs/proc/base.c
-@@ -190,6 +190,26 @@ static int proc_root_link(struct inode *
- 	return result;
- }
+--- linux-2.6.21.noarch/fs/proc/base.c~	2007-06-04 17:56:24.000000000 -0400
++++ linux-2.6.21.noarch/fs/proc/base.c	2007-06-04 17:56:59.000000000 -0400
+@@ -199,6 +199,27 @@ static int proc_root_link(struct inode *
+ 	 (task->state == TASK_STOPPED || task->state == TASK_TRACED) && \
+ 	 security_ptrace(current,task) == 0))
  
 +struct mm_struct *mm_for_maps(struct task_struct *task)
 +{
 +	struct mm_struct *mm = get_task_mm(task);
++
 +	if (!mm)
 +		return NULL;
 +	down_read(&mm->mmap_sem);


--- linux-2.6-ppc64-no-apm.patch DELETED ---