rpms/kernel/devel linux-2.6-execshield.patch, 1.61, 1.62 linux-2.6-utrace-regset-sparc64.patch, 1.1, 1.2 linux-2.6-utrace-tracehook.patch, 1.3, 1.4

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	linux-2.6-execshield.patch 
	linux-2.6-utrace-regset-sparc64.patch 
	linux-2.6-utrace-tracehook.patch 
Log Message:
more build fixes

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- linux-2.6-execshield.patch	20 Jul 2007 19:52:27 -0000	1.61
+++ linux-2.6-execshield.patch	20 Jul 2007 21:26:41 -0000	1.62
@@ -931,7 +931,7 @@
 @@ -440,7 +440,11 @@ static int do_task_stat(struct task_stru
  	rcu_read_unlock();
  
- 	if (!whole || num_threads < 2)
+ 	if (!whole || num_threads < 2) {
 -		wchan = get_wchan(task);
 +		wchan = 0;
 +		if (current->uid == task->uid || current->euid == task->uid ||

linux-2.6-utrace-regset-sparc64.patch:

Index: linux-2.6-utrace-regset-sparc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-sparc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-utrace-regset-sparc64.patch	12 Jul 2007 19:40:19 -0000	1.1
+++ linux-2.6-utrace-regset-sparc64.patch	20 Jul 2007 21:26:41 -0000	1.2
@@ -706,7 +706,7 @@
   * accessed page.  Then our caller (copy_{to,from}_user_page()) did
 --- linux-2.6/arch/sparc64/kernel/systbls.S
 +++ linux-2.6/arch/sparc64/kernel/systbls.S
-@@ -24,7 +24,7 @@ sys_call_table32:
+@@ -23,7 +23,7 @@ sys_call_table32:
  /*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys32_chown16, sys32_mknod
  /*15*/	.word sys_chmod, sys32_lchown16, sparc_brk, sys32_perfctr, sys32_lseek
  /*20*/	.word sys_getpid, sys_capget, sys_capset, sys32_setuid16, sys32_getuid16
@@ -715,7 +715,7 @@
  /*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice
  	.word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile
  /*40*/	.word compat_sys_newlstat, sys_dup, sys_pipe, compat_sys_times, sys_getuid
-@@ -170,7 +170,7 @@ sunos_sys_table:
+@@ -169,7 +169,7 @@ sunos_sys_table:
  	.word sys_chmod, sys32_lchown16, sunos_brk
  	.word sunos_nosys, sys32_lseek, sunos_getpid
  	.word sunos_nosys, sunos_nosys, sunos_nosys

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook.patch	20 Jul 2007 19:52:27 -0000	1.3
+++ linux-2.6-utrace-tracehook.patch	20 Jul 2007 21:26:41 -0000	1.4
@@ -1603,7 +1603,7 @@
  	return error;
 --- linux-2.6/arch/sparc64/kernel/sys_sparc32.c
 +++ linux-2.6/arch/sparc64/kernel/sys_sparc32.c
-@@ -682,9 +682,6 @@ asmlinkage long sparc32_execve(struct pt
+@@ -681,9 +681,6 @@ asmlinkage long sparc32_execve(struct pt
  		current_thread_info()->xfsr[0] = 0;
  		current_thread_info()->fpsaved[0] = 0;
  		regs->tstate &= ~TSTATE_PEF;
@@ -1644,7 +1644,7 @@
  	strncpy(p->comm, type, sizeof(p->comm)-1);
 --- linux-2.6/arch/ia64/kernel/asm-offsets.c
 +++ linux-2.6/arch/ia64/kernel/asm-offsets.c
-@@ -45,7 +45,7 @@ void foo(void)
+@@ -47,7 +47,7 @@ void foo(void)
  	DEFINE(IA64_TASK_GROUP_LEADER_OFFSET, offsetof (struct task_struct, group_leader));
  	DEFINE(IA64_TASK_PENDING_OFFSET,offsetof (struct task_struct, pending));
  	DEFINE(IA64_TASK_PID_OFFSET, offsetof (struct task_struct, pid));