[kernel] r13421 - dists/etch-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Tue Apr 14 04:41:30 2009
New Revision: 13421

Log:
adjust to apply to 2.6.18

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl-SHM_INFO-lockup-without-CONFIG_SHMEM.patch

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl-SHM_INFO-lockup-without-CONFIG_SHMEM.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl-SHM_INFO-lockup-without-CONFIG_SHMEM.patch	Mon Apr 13 17:11:14 2009	(r13420)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/shm-fix-shmctl-SHM_INFO-lockup-without-CONFIG_SHMEM.patch	Tue Apr 14 04:41:30 2009	(r13421)
@@ -23,12 +23,12 @@
     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at debian.org
+Adjusted to apply to Debian's 2.6.18 by dann frazier <dannf at debian.org
 
 diff -urpN a/ipc/shm.c b/ipc/shm.c
---- a/ipc/shm.c	2009-04-05 19:32:23.000000000 -0600
-+++ b/ipc/shm.c	2009-04-06 00:01:41.000000000 -0600
-@@ -630,11 +630,15 @@ static void shm_get_stat(struct ipc_name
+--- a/ipc/shm.c	2009-04-13 22:39:09.000000000 -0600
++++ b/ipc/shm.c	2009-04-13 22:39:32.000000000 -0600
+@@ -416,11 +416,15 @@ static void shm_get_stat(unsigned long *
  			struct address_space *mapping = inode->i_mapping;
  			*rss += (HPAGE_SIZE/PAGE_SIZE)*mapping->nrpages;
  		} else {
@@ -42,5 +42,5 @@
 +			*rss += inode->i_mapping->nrpages;
 +#endif
  		}
- 
- 		total++;
+ 	}
+ }