Title: [9094] trunk: [!no_src_qa!] update to linux-2.6.34.5
- Revision
- 9094
- Author
- vapier
- Date
- 2010-08-20 17:18:55 -0400 (Fri, 20 Aug 2010)
Log Message
[!no_src_qa!] update to linux-2.6.34.5
Modified Paths
Diff
Modified: trunk/Makefile (9093 => 9094)
--- trunk/Makefile 2010-08-20 11:59:27 UTC (rev 9093)
+++ trunk/Makefile 2010-08-20 21:18:55 UTC (rev 9094)
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
-EXTRAVERSION = .4
+EXTRAVERSION = .5
NAME = Sheep on Meth
# *DOCUMENTATION*
Modified: trunk/arch/x86/kernel/cpu/vmware.c (9093 => 9094)
--- trunk/arch/x86/kernel/cpu/vmware.c 2010-08-20 11:59:27 UTC (rev 9093)
+++ trunk/arch/x86/kernel/cpu/vmware.c 2010-08-20 21:18:55 UTC (rev 9094)
@@ -23,6 +23,7 @@
#include <linux/dmi.h>
#include <linux/module.h>
+#include <linux/jiffies.h>
#include <asm/div64.h>
#include <asm/vmware.h>
#include <asm/x86_init.h>
Modified: trunk/fs/proc/task_mmu.c (9093 => 9094)
--- trunk/fs/proc/task_mmu.c 2010-08-20 11:59:27 UTC (rev 9093)
+++ trunk/fs/proc/task_mmu.c 2010-08-20 21:18:55 UTC (rev 9094)
@@ -210,6 +210,7 @@
int flags = vma->vm_flags;
unsigned long ino = 0;
unsigned long long pgoff = 0;
+ unsigned long start;
dev_t dev = 0;
int len;
@@ -220,8 +221,13 @@
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
+ /* We don't show the stack guard page in /proc/maps */
+ start = vma->vm_start;
+ if (vma->vm_flags & VM_GROWSDOWN)
+ start += PAGE_SIZE;
+
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
- vma->vm_start,
+ start,
vma->vm_end,
flags & VM_READ ? 'r' : '-',
flags & VM_WRITE ? 'w' : '-',
Modified: trunk/mm/memory.c (9093 => 9094)
--- trunk/mm/memory.c 2010-08-20 11:59:27 UTC (rev 9093)
+++ trunk/mm/memory.c 2010-08-20 21:18:55 UTC (rev 9094)
@@ -2783,24 +2783,23 @@
spinlock_t *ptl;
pte_t entry;
- if (check_stack_guard_page(vma, address) < 0) {
- pte_unmap(page_table);
+ pte_unmap(page_table);
+
+ /* Check if we need to add a guard page to the stack */
+ if (check_stack_guard_page(vma, address) < 0)
return VM_FAULT_SIGBUS;
- }
+ /* Use the zero-page for reads */
if (!(flags & FAULT_FLAG_WRITE)) {
entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
vma->vm_page_prot));
- ptl = pte_lockptr(mm, pmd);
- spin_lock(ptl);
+ page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
if (!pte_none(*page_table))
goto unlock;
goto setpte;
}
/* Allocate our own private page. */
- pte_unmap(page_table);
-
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage_movable(vma, address);
Modified: trunk/mm/mlock.c (9093 => 9094)
--- trunk/mm/mlock.c 2010-08-20 11:59:27 UTC (rev 9093)
+++ trunk/mm/mlock.c 2010-08-20 21:18:55 UTC (rev 9094)
@@ -167,6 +167,14 @@
if (vma->vm_flags & VM_WRITE)
gup_flags |= FOLL_WRITE;
+ /* We don't try to access the guard page of a stack vma */
+ if (vma->vm_flags & VM_GROWSDOWN) {
+ if (start == vma->vm_start) {
+ start += PAGE_SIZE;
+ nr_pages--;
+ }
+ }
+
while (nr_pages > 0) {
int i;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
