projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update linux 3.3 to 3.3.1
[openwrt/staging/mkresin.git]
/
target
/
linux
/
generic
/
patches-3.3
/
950-vm_exports.patch
diff --git
a/target/linux/generic/patches-3.3/950-vm_exports.patch
b/target/linux/generic/patches-3.3/950-vm_exports.patch
index 5b5a17728a41624619522fe18585cf25d1ef7a77..b9abd0c1ca4bb69b35065eaacacf0786cc8368d1 100644
(file)
--- a/
target/linux/generic/patches-3.3/950-vm_exports.patch
+++ b/
target/linux/generic/patches-3.3/950-vm_exports.patch
@@
-61,7
+61,7
@@
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -385
6,6 +3856
,7 @@ int can_nice(const struct task_struct *p
+@@ -385
5,6 +3855
,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@@
-71,7
+71,7
@@
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -14
04,6 +1404
,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -14
12,6 +1412
,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(&tlb, address, end);
return end;
}
tlb_finish_mmu(&tlb, address, end);
return end;
}
@@
-79,7
+79,7
@@
/**
* zap_vma_ptes - remove ptes mapping the vma
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -30
79,6 +3080
,7 @@ static inline int check_stack_guard_page
+@@ -30
87,6 +3088
,7 @@ static inline int check_stack_guard_page
}
return 0;
}
}
return 0;
}