r2381 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-23 22:21:39 +0100 (Sun, 23 Jan 2005)
New Revision: 2381

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch
Log:
beat patch into applying


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch	2005-01-23 21:20:40 UTC (rev 2380)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/amd64-quotactl.dpatch	2005-01-23 21:21:39 UTC (rev 2381)
@@ -45,23 +45,22 @@
 diff -Nru a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
 --- a/arch/x86_64/ia32/sys_ia32.c	2005-01-16 16:09:23 -08:00
 +++ b/arch/x86_64/ia32/sys_ia32.c	2005-01-16 16:09:23 -08:00
-@@ -1331,18 +1331,6 @@
+@@ -1331,16 +1331,4 @@
  	return -ENOSYS;
  } 
  
 -long sys32_quotactl(void)
 -{ 
 -	struct task_struct *me = current;
--	static char lastcomm[8];
--	if (strcmp(lastcomm, me->comm)) {
+-	static char lastcomm[sizeof(me->comm)];
+-	if (strncmp(lastcomm, me->comm, sizeof(me->comm))) {
 -		printk(KERN_INFO "%s: 32bit quotactl not supported on 64 bit kernel\n",
 -		       me->comm);
--		strcpy(lastcomm, me->comm); 
+-		strncpy(lastcomm, me->comm, sizeof(me->comm)); 
 -	} 
 -	return -ENOSYS;
 -} 
 -
- long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,
- 			  char __user * buf, size_t len)
- {
+ cond_syscall(sys32_ipc)
 
+ static int __init ia32_init (void)