rpms/kernel/devel linux-2.6-compile-fixes.patch, 1.109, 1.110 linux-2.6-utrace.patch, 1.41, 1.42

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Dec 8 11:54:59 UTC 2006


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18554

Modified Files:
	linux-2.6-compile-fixes.patch linux-2.6-utrace.patch 
Log Message:
build fixes

linux-2.6-compile-fixes.patch:
 arch/powerpc/sysdev/rom.c                   |    1 +
 include/asm-powerpc/Kbuild                  |    2 +-
 linux-2.6.19.noarch/include/asm-i386/desc.h |   28 ++++++++++++++--------------
 linux-2.6.19.noarch/mm/mmap.c               |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- linux-2.6-compile-fixes.patch	7 Dec 2006 14:20:03 -0000	1.109
+++ linux-2.6-compile-fixes.patch	8 Dec 2006 11:54:56 -0000	1.110
@@ -26,13 +26,58 @@
  
  static int __init powerpc_flash_init(void)
  {
---- linux-2.6.19.noarch/kernel/workqueue.c~	2006-12-07 09:19:01.242754000 -0500
-+++ linux-2.6.19.noarch/kernel/workqueue.c	2006-12-07 09:19:17.461515000 -0500
-@@ -608,6 +608,7 @@ int current_is_keventd(void)
- 	return ret;
+--- linux-2.6.19.noarch/mm/mmap.c~	2006-12-08 06:51:55.000000000 -0500
++++ linux-2.6.19.noarch/mm/mmap.c	2006-12-08 06:52:05.000000000 -0500
+@@ -2226,7 +2226,7 @@ int install_special_mapping(struct mm_st
+ 	struct vm_area_struct *vma;
+ 	int err;
  
+-	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
++	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
+ 	if (unlikely(vma == NULL))
+ 		return -ENOMEM;
+ 	memset(vma, 0, sizeof(*vma));
+--- 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;
  }
-+EXPORT_SYMBOL_GPL(current_is_keventd);
  
- #ifdef CONFIG_HOTPLUG_CPU
- /* Take the work from this (downed) CPU. */
++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

linux-2.6-utrace.patch:
 Documentation/utrace.txt            |  579 +++++++++++
 arch/alpha/kernel/asm-offsets.c     |    2 
 arch/alpha/kernel/entry.S           |    4 
 arch/arm/kernel/ptrace.c            |   36 
 arch/arm26/kernel/ptrace.c          |   32 
 arch/frv/kernel/ptrace.c            |   15 
 arch/i386/kernel/entry.S            |    7 
 arch/i386/kernel/i387.c             |  143 +-
 arch/i386/kernel/process.c          |    3 
 arch/i386/kernel/ptrace.c           |  863 +++++++++-------
 arch/i386/kernel/signal.c           |   37 
 arch/i386/kernel/vm86.c             |    7 
 arch/ia64/ia32/ia32_entry.S         |    2 
 arch/ia64/ia32/sys_ia32.c           |  537 ++++++++++
 arch/ia64/kernel/asm-offsets.c      |    2 
 arch/ia64/kernel/fsys.S             |   16 
 arch/ia64/kernel/mca.c              |    2 
 arch/ia64/kernel/ptrace.c           | 1680 ++++++++++++++++----------------
 arch/ia64/kernel/signal.c           |    4 
 arch/mips/kernel/ptrace.c           |   21 
 arch/mips/kernel/sysirix.c          |    2 
 arch/powerpc/kernel/Makefile        |    4 
 arch/powerpc/kernel/asm-offsets.c   |    2 
 arch/powerpc/kernel/process.c       |    5 
 arch/powerpc/kernel/ptrace-common.h |  161 ---
 arch/powerpc/kernel/ptrace.c        |  959 +++++++++++-------
 arch/powerpc/kernel/ptrace32.c      |  436 --------
 arch/powerpc/kernel/signal_32.c     |   55 +
 arch/powerpc/kernel/signal_64.c     |    3 
 arch/powerpc/kernel/sys_ppc32.c     |    5 
 arch/powerpc/lib/sstep.c            |    3 
 arch/ppc/kernel/asm-offsets.c       |    2 
 arch/s390/kernel/Makefile           |    2 
 arch/s390/kernel/compat_linux.c     |    3 
 arch/s390/kernel/compat_signal.c    |    5 
 arch/s390/kernel/process.c          |    3 
 arch/s390/kernel/ptrace.c           | 1073 +++++++++-----------
 arch/s390/kernel/signal.c           |    3 
 arch/s390/kernel/traps.c            |    6 
 arch/sparc64/kernel/Makefile        |    2 
 arch/sparc64/kernel/binfmt_aout32.c |    2 
 arch/sparc64/kernel/entry.S         |    6 
 arch/sparc64/kernel/process.c       |    3 
 arch/sparc64/kernel/ptrace.c        | 1221 ++++++++++++-----------
 arch/sparc64/kernel/signal.c        |    2 
 arch/sparc64/kernel/signal32.c      |    2 
 arch/sparc64/kernel/sys_sparc32.c   |    3 
 arch/sparc64/kernel/systbls.S       |    4 
 arch/x86_64/ia32/fpu32.c            |   92 +
 arch/x86_64/ia32/ia32_aout.c        |    6 
 arch/x86_64/ia32/ia32_signal.c      |    8 
 arch/x86_64/ia32/ia32entry.S        |    2 
 arch/x86_64/ia32/ptrace32.c         |  723 +++++++++----
 arch/x86_64/ia32/sys_ia32.c         |    5 
 arch/x86_64/kernel/process.c        |    5 
 arch/x86_64/kernel/ptrace.c         |  657 +++++++-----
 arch/x86_64/kernel/signal.c         |   28 
 arch/x86_64/kernel/traps.c          |    8 
 arch/x86_64/mm/fault.c              |    4 
 drivers/connector/cn_proc.c         |    4 
 fs/binfmt_aout.c                    |    6 
 fs/binfmt_elf.c                     |    6 
 fs/binfmt_elf_fdpic.c               |    7 
 fs/binfmt_flat.c                    |    3 
 fs/binfmt_som.c                     |    2 
 fs/exec.c                           |   11 
 fs/proc/array.c                     |   12 
 fs/proc/base.c                      |   17 
 include/asm-i386/i387.h             |   13 
 include/asm-i386/signal.h           |    4 
 include/asm-i386/thread_info.h      |    7 
 include/asm-i386/tracehook.h        |   49 
 include/asm-ia64/elf.h              |   24 
 include/asm-ia64/tracehook.h        |   83 +
 include/asm-powerpc/tracehook.h     |   80 +
 include/asm-s390/tracehook.h        |   53 +
 include/asm-sparc64/tracehook.h     |   44 
 include/asm-x86_64/fpu32.h          |    3 
 include/asm-x86_64/thread_info.h    |    2 
 include/asm-x86_64/tracehook.h      |   54 +
 include/linux/init_task.h           |    3 
 include/linux/ptrace.h              |  224 +++-
 include/linux/sched.h               |   25 
 include/linux/tracehook.h           |  707 +++++++++++++
 include/linux/utrace.h              |  504 +++++++++
 init/Kconfig                        |   29 
 kernel/Makefile                     |    1 
 kernel/exit.c                       |  244 +---
 kernel/fork.c                       |   62 -
 kernel/ptrace.c                     | 1633 +++++++++++++++++++++++++------
 kernel/signal.c                     |  211 ----
 kernel/sys.c                        |    2 
 kernel/timer.c                      |    6 
 kernel/tsacct.c                     |    2 
 kernel/utrace.c                     | 1860 ++++++++++++++++++++++++++++++++++++
 security/selinux/hooks.c            |   54 -
 security/selinux/include/objsec.h   |    1 
 97 files changed, 10509 insertions(+), 5050 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- linux-2.6-utrace.patch	8 Dec 2006 11:36:19 -0000	1.41
+++ linux-2.6-utrace.patch	8 Dec 2006 11:54:56 -0000	1.42
@@ -3441,7 +3441,7 @@
 +			? ERR_PTR(-ERESTARTNOINTR) : NULL);
 +	}
 +
-+	utrace = kmem_cache_alloc(utrace_cachep, SLAB_KERNEL);
++	utrace = kmem_cache_alloc(utrace_cachep, GFP_KERNEL);
 +	if (unlikely(utrace == NULL))
 +		return ERR_PTR(-ENOMEM);
 +
@@ -3717,7 +3717,7 @@
 +			return ERR_PTR(-ENOENT);
 +		}
 +
-+		engine = kmem_cache_alloc(utrace_engine_cachep, SLAB_KERNEL);
++		engine = kmem_cache_alloc(utrace_engine_cachep, GFP_KERNEL);
 +		if (unlikely(engine == NULL))
 +			return ERR_PTR(-ENOMEM);
 +		engine->flags = 0;
@@ -3746,7 +3746,7 @@
 +		}
 +		rcu_read_unlock();
 +
-+		engine = kmem_cache_alloc(utrace_engine_cachep, SLAB_KERNEL);
++		engine = kmem_cache_alloc(utrace_engine_cachep, GFP_KERNEL);
 +		if (unlikely(engine == NULL))
 +			return ERR_PTR(-ENOMEM);
 +		engine->flags = 0;




More information about the fedora-cvs-commits mailing list