packages (LINUX_2_6_37): kernel/kernel-grsec_full.patch, kernel/kernel.spec...

[baggins]

Author: baggins                      Date: Wed Mar 23 22:21:13 2011 GMT
Module: packages                      Tag: LINUX_2_6_37
---- Log message:
- 2.6.37.5

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.61.2.2 -> 1.61.2.3) , kernel.spec (1.888.2.4 -> 1.888.2.5) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.61.2.2 packages/kernel/kernel-grsec_full.patch:1.61.2.3
--- packages/kernel/kernel-grsec_full.patch:1.61.2.2	Wed Mar 23 18:00:28 2011
+++ packages/kernel/kernel-grsec_full.patch	Wed Mar 23 23:21:07 2011
@@ -17600,10 +17600,10 @@
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -231,18 +269,35 @@ void vmalloc_sync_all(void)
+@@ -231,19 +269,36 @@ void vmalloc_sync_all(void)
+ 	for (address = VMALLOC_START & PMD_MASK;
+ 	     address >= TASK_SIZE && address < FIXADDR_TOP;
  	     address += PMD_SIZE) {
- 
- 		unsigned long flags;
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +		unsigned long cpu;
@@ -17611,7 +17611,7 @@
  		struct page *page;
 +#endif
  
- 		spin_lock_irqsave(&pgd_lock, flags);
+ 		spin_lock(&pgd_lock);
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +		for (cpu = 0; cpu < NR_CPUS; ++cpu) {
@@ -17623,6 +17623,7 @@
  			spinlock_t *pgt_lock;
  			pmd_t *ret;
  
+ 			/* the pgt_lock only for Xen */
  			pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
  
  			spin_lock(pgt_lock);
@@ -18711,9 +18712,9 @@
  
  int force_personality32;
 @@ -106,12 +106,22 @@ void sync_global_pgds(unsigned long star
+ 
  	for (address = start; address <= end; address += PGDIR_SIZE) {
  		const pgd_t *pgd_ref = pgd_offset_k(address);
- 		unsigned long flags;
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +		unsigned long cpu;
@@ -18724,7 +18725,7 @@
  		if (pgd_none(*pgd_ref))
  			continue;
  
- 		spin_lock_irqsave(&pgd_lock, flags);
+ 		spin_lock(&pgd_lock);
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +		for (cpu = 0; cpu < NR_CPUS; ++cpu) {
@@ -19391,7 +19392,7 @@
  		return -ENOMEM;
  	}
  
-@@ -215,51 +267,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -215,51 +267,55 @@ static int preallocate_pmds(pmd_t *pmds[
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -19461,10 +19462,9 @@
  	pgd_t *pgd;
 -	pmd_t *pmds[PREALLOCATED_PMDS];
 +	pxd_t *pxds[PREALLOCATED_PXDS];
-+
- 	unsigned long flags;
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
+ 
 @@ -269,11 +326,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
@@ -19480,13 +19480,13 @@
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
 @@ -283,14 +340,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
- 	spin_lock_irqsave(&pgd_lock, flags);
+ 	spin_lock(&pgd_lock);
  
  	pgd_ctor(mm, pgd);
 -	pgd_prepopulate_pmd(mm, pgd, pmds);
 +	pgd_prepopulate_pxd(mm, pgd, pxds);
  
- 	spin_unlock_irqrestore(&pgd_lock, flags);
+ 	spin_unlock(&pgd_lock);
  
  	return pgd;
  

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.888.2.4 packages/kernel/kernel.spec:1.888.2.5
--- packages/kernel/kernel.spec:1.888.2.4	Wed Mar 23 22:06:48 2011
+++ packages/kernel/kernel.spec	Wed Mar 23 23:21:07 2011
@@ -88,8 +88,8 @@
 %endif
 
 %define		basever		2.6.37
-%define		postver		.4
-%define		rel		2
+%define		postver		.5
+%define		rel		1
 
 %define		_enable_debug_packages			0
 
@@ -132,7 +132,7 @@
 # Source0-md5:	c8ee37b4fdccdb651e0603d35350b434
 %if "%{postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	5e5ad9a86f9a29cd2c1b8a171d89f9aa
+# Source1-md5:	55efa62ef683700869ef33f56046b521
 %endif
 
 Source3:	kernel-autoconf.h
@@ -1538,6 +1538,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.888.2.5  2011/03/23 22:21:07  baggins
+- 2.6.37.5
+
 Revision 1.888.2.4  2011/03/23 21:06:48  arekm
 - rel 2; fix OOM at xfs mount with quotas enabled when there is many inodes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.61.2.2&r2=1.61.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.888.2.4&r2=1.888.2.5&f=u