rpms/kernel/devel patch-2.6.33-rc4-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1155, 1.1156 kernel.spec, 1.1898, 1.1899 linux-2.6-execshield.patch, 1.115, 1.116 sources, 1.1114, 1.1115 upstream, 1.1027, 1.1028 patch-2.6.33-rc4-git3.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 18 19:43:39 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6915
Modified Files:
.cvsignore kernel.spec linux-2.6-execshield.patch sources
upstream
Added Files:
patch-2.6.33-rc4-git6.bz2.sign
Removed Files:
patch-2.6.33-rc4-git3.bz2.sign
Log Message:
* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.16.rc4.git6
- 2.6.33-rc4-git6
- execshield: rebase for mm_types.h reject
--- NEW FILE patch-2.6.33-rc4-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLVE2dyGugalF9Dw4RAhFIAJ4vkxgKuUnZZJB9WRDPJ8ZToHg3SwCgiRf7
HW7GwCgS7319JttJanypuRQ=
=iTvW
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -p -r1.1155 -r1.1156
--- .cvsignore 16 Jan 2010 21:17:00 -0000 1.1155
+++ .cvsignore 18 Jan 2010 19:43:37 -0000 1.1156
@@ -6,4 +6,4 @@ temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
patch-2.6.33-rc4.bz2
-patch-2.6.33-rc4-git3.bz2
+patch-2.6.33-rc4-git6.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -p -r1.1898 -r1.1899
--- kernel.spec 18 Jan 2010 15:30:08 -0000 1.1898
+++ kernel.spec 18 Jan 2010 19:43:38 -0000 1.1899
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 3
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1967,6 +1967,10 @@ fi
# and build.
%changelog
+* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.16.rc4.git6
+- 2.6.33-rc4-git6
+- execshield: rebase for mm_types.h reject
+
* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com>
- vhost_net-rollup.patch: https://fedoraproject.org/wiki/Features/VHostNet
from davem/net-next-2.6.git
linux-2.6-execshield.patch:
arch/x86/include/asm/desc.h | 25 ++++++
arch/x86/include/asm/mmu.h | 7 +
arch/x86/include/asm/paravirt.h | 6 +
arch/x86/include/asm/paravirt_types.h | 3
arch/x86/include/asm/processor.h | 3
arch/x86/kernel/cpu/common.c | 14 +++
arch/x86/kernel/paravirt.c | 3
arch/x86/kernel/process_32.c | 48 ++++++++++++
arch/x86/kernel/traps.c | 129 +++++++++++++++++++++++++++++++---
arch/x86/mm/mmap.c | 5 +
arch/x86/mm/setup_nx.c | 6 +
arch/x86/mm/tlb.c | 7 +
arch/x86/vdso/vdso32-setup.c | 2
arch/x86/xen/enlighten.c | 21 +++++
fs/binfmt_elf.c | 21 ++++-
include/linux/mm.h | 8 +-
include/linux/mm_types.h | 3
include/linux/resource.h | 5 +
include/linux/sched.h | 7 +
kernel/sysctl.c | 28 +++++++
mm/mmap.c | 121 +++++++++++++++++++++++++++++--
mm/mprotect.c | 10 ++
mm/mremap.c | 5 -
23 files changed, 459 insertions(+), 28 deletions(-)
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- linux-2.6-execshield.patch 11 Jan 2010 23:05:10 -0000 1.115
+++ linux-2.6-execshield.patch 18 Jan 2010 19:43:38 -0000 1.116
@@ -1,5 +1,36 @@
+From f19502d20f5c1e59244fa361496371f320dff55e Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
+Date: Mon, 18 Jan 2010 14:39:29 -0500
+Subject: execshield
+
+---
+ arch/x86/include/asm/desc.h | 25 +++++++
+ arch/x86/include/asm/mmu.h | 7 ++
+ arch/x86/include/asm/paravirt.h | 6 ++
+ arch/x86/include/asm/paravirt_types.h | 3 +
+ arch/x86/include/asm/processor.h | 3 +
+ arch/x86/kernel/cpu/common.c | 14 ++++
+ arch/x86/kernel/paravirt.c | 3 +
+ arch/x86/kernel/process_32.c | 48 ++++++++++++
+ arch/x86/kernel/traps.c | 129 ++++++++++++++++++++++++++++++---
+ arch/x86/mm/mmap.c | 5 +-
+ arch/x86/mm/setup_nx.c | 6 ++
+ arch/x86/mm/tlb.c | 7 ++
+ arch/x86/vdso/vdso32-setup.c | 2 +-
+ arch/x86/xen/enlighten.c | 21 ++++++
+ fs/binfmt_elf.c | 21 +++++-
+ include/linux/mm.h | 8 ++-
+ include/linux/mm_types.h | 3 +
+ include/linux/resource.h | 5 +-
+ include/linux/sched.h | 7 ++
+ kernel/sysctl.c | 28 +++++++
+ mm/mmap.c | 121 +++++++++++++++++++++++++++++--
+ mm/mprotect.c | 10 +++-
+ mm/mremap.c | 4 +-
+ 23 files changed, 459 insertions(+), 27 deletions(-)
+
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e8de2f6..538c2b6 100644
+index 617bd56..526248d 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -5,6 +5,7 @@
@@ -71,7 +102,7 @@ index 80a1dee..8314c66 100644
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 8aebcc4..cbbd2b0 100644
+index dd59a85..9ba7d12 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -289,6 +289,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
@@ -88,7 +119,7 @@ index 8aebcc4..cbbd2b0 100644
{
PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index dd0f5b3..c2727ef 100644
+index b1e70d5..0071abd 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -118,6 +118,9 @@ struct pv_cpu_ops {
@@ -102,10 +133,10 @@ index dd0f5b3..c2727ef 100644
void (*load_tls)(struct thread_struct *t, unsigned int cpu);
#ifdef CONFIG_X86_64
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index c3429e8..62cc460 100644
+index fc801ba..8d2df5c 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -161,6 +161,9 @@ static inline int hlt_works(int cpu)
+@@ -162,6 +162,9 @@ static inline int hlt_works(int cpu)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
@@ -116,10 +147,10 @@ index c3429e8..62cc460 100644
extern struct pt_regs *idle_regs(struct pt_regs *);
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index cc25c2b..6ce4863 100644
+index 4868e4a..6c8d2ca 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -798,6 +798,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -802,6 +802,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
/* Filter out anything that depends on CPUID levels we don't have */
filter_cpuid_features(c, true);
@@ -155,10 +186,10 @@ index 1b1739d..c2dda16 100644
.load_idt = native_load_idt,
.store_gdt = native_store_gdt,
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 4cf7956..b2407dc 100644
+index 37ad1e0..9524afe 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
-@@ -296,7 +296,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -257,7 +257,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
void
start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
{
@@ -169,7 +200,7 @@ index 4cf7956..b2407dc 100644
regs->fs = 0;
set_fs(USER_DS);
regs->ds = __USER_DS;
-@@ -305,6 +308,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -266,6 +269,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
regs->cs = __USER_CS;
regs->ip = new_ip;
regs->sp = new_sp;
@@ -181,7 +212,7 @@ index 4cf7956..b2407dc 100644
/*
* Free the old FP and other extended state
*/
-@@ -364,6 +372,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -325,6 +333,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
if (preload_fpu)
prefetch(next->xstate);
@@ -191,7 +222,7 @@ index 4cf7956..b2407dc 100644
/*
* Reload esp0.
*/
-@@ -497,3 +508,40 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -418,3 +429,40 @@ unsigned long get_wchan(struct task_struct *p)
return 0;
}
@@ -233,7 +264,7 @@ index 4cf7956..b2407dc 100644
+ set_user_cs(&mm->context.user_cs, 0);
+}
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 7e37dce..92ae538 100644
+index 3339917..9b03688 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -115,6 +115,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
@@ -343,7 +374,7 @@ index 7e37dce..92ae538 100644
tsk->thread.error_code = error_code;
tsk->thread.trap_no = 13;
-@@ -881,19 +974,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -860,19 +953,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
}
#ifdef CONFIG_X86_32
@@ -390,32 +421,6 @@ index 7e37dce..92ae538 100644
}
#endif
---- linux-2.6.32.noarch/arch/x86/mm/setup_nx.c~ 2010-01-11 16:16:52.000000000 -0500
-+++ linux-2.6.32.noarch/arch/x86/mm/setup_nx.c 2010-01-11 16:18:19.000000000 -0500
-@@ -1,3 +1,4 @@
-+#include <linux/sched.h>
- #include <linux/spinlock.h>
- #include <linux/errno.h>
- #include <linux/init.h>
-@@ -24,6 +24,7 @@ static int __init noexec_setup(char *str
- disable_nx = 0;
- } else if (!strncmp(str, "off", 3)) {
- disable_nx = 1;
-+ exec_shield = 0;
- }
- x86_configure_nx();
- return 0;
-@@ -41,6 +41,10 @@ void __cpuinit x86_configure_nx(void)
- void __init x86_report_nx(void)
- {
- if (!cpu_has_nx) {
-+ if (exec_shield)
-+ printk(KERN_INFO "Using x86 segment limits to approximate NX protection\n");
-+ else
-+
- printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
- "missing in CPU or disabled in BIOS!\n");
- } else {
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index c8191de..7d84d01 100644
--- a/arch/x86/mm/mmap.c
@@ -438,8 +443,36 @@ index c8191de..7d84d01 100644
mm->unmap_area = arch_unmap_area_topdown;
}
}
+diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
+index a3250aa..e0d9cce 100644
+--- a/arch/x86/mm/setup_nx.c
++++ b/arch/x86/mm/setup_nx.c
+@@ -1,3 +1,4 @@
++#include <linux/sched.h>
+ #include <linux/spinlock.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+@@ -23,6 +24,7 @@ static int __init noexec_setup(char *str)
+ disable_nx = 0;
+ } else if (!strncmp(str, "off", 3)) {
+ disable_nx = 1;
++ exec_shield = 0;
+ }
+ x86_configure_nx();
+ return 0;
+@@ -40,6 +42,10 @@ void __cpuinit x86_configure_nx(void)
+ void __init x86_report_nx(void)
+ {
+ if (!cpu_has_nx) {
++ if (exec_shield)
++ printk(KERN_INFO "Using x86 segment limits to approximate NX protection\n");
++ else
++
+ printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
+ "missing in CPU or disabled in BIOS!\n");
+ } else {
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 36fe08e..3806a45 100644
+index 65b58e4..cf1ea57 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -6,6 +6,7 @@
@@ -449,8 +482,8 @@ index 36fe08e..3806a45 100644
+#include <asm/desc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
- #include <asm/apic.h>
-@@ -130,6 +131,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+ #include <asm/cache.h>
+@@ -131,6 +132,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
union smp_flush_state *f;
cpu = smp_processor_id();
@@ -464,7 +497,7 @@ index 36fe08e..3806a45 100644
* orig_rax contains the negated interrupt vector.
* Use that to determine where the sender put the data.
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 58bc00f..1fdafb5 100644
+index 02b442e..957bb67 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
@@ -477,10 +510,10 @@ index 58bc00f..1fdafb5 100644
ret = addr;
goto up_fail;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 3439616..31e5c6f 100644
+index 36daccb..4ad374a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -323,6 +323,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -333,6 +333,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
xen_mc_issue(PARAVIRT_LAZY_CPU);
}
@@ -505,7 +538,7 @@ index 3439616..31e5c6f 100644
static void xen_load_gdt(const struct desc_ptr *dtr)
{
unsigned long va = dtr->address;
-@@ -949,6 +967,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -959,6 +977,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
.load_tr_desc = paravirt_nop,
.set_ldt = xen_set_ldt,
@@ -516,7 +549,7 @@ index 3439616..31e5c6f 100644
.load_idt = xen_load_idt,
.load_tls = xen_load_tls,
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index b9b3bb5..1e55926 100644
+index edd90c4..33f2f2d 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -73,7 +73,7 @@ static struct linux_binfmt elf_format = {
@@ -576,10 +609,10 @@ index b9b3bb5..1e55926 100644
* load_elf_interp() returns relocation
* adjustment
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 24c3956..88f944d 100644
+index 60c467b..8eb1643 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1129,7 +1129,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1148,7 +1148,13 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
@@ -595,10 +628,10 @@ index 24c3956..88f944d 100644
extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 84a524a..a81e0db 100644
+index 36f9627..bd4fe42 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -206,6 +206,9 @@ struct mm_struct {
+@@ -209,6 +209,9 @@ struct mm_struct {
unsigned long (*get_unmapped_area) (struct file *filp,
unsigned long addr, unsigned long len,
unsigned long pgoff, unsigned long flags);
@@ -606,13 +639,13 @@ index 84a524a..a81e0db 100644
+ unsigned long addr, unsigned long len,
+ unsigned long pgoff, unsigned long flags);
void (*unmap_area) (struct mm_struct *mm, unsigned long addr);
+ #endif
unsigned long mmap_base; /* base of mmap area */
- unsigned long task_size; /* size of task vm space */
diff --git a/include/linux/resource.h b/include/linux/resource.h
-index 40fc7e6..68c2549 100644
+index f1e914e..d2aef9a 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
-@@ -55,8 +55,11 @@ struct rlimit {
+@@ -53,8 +53,11 @@ struct rlimit {
/*
* Limit the stack by to some sane default: root can always
* increase this limit if needed.. 8MB seems reasonable.
@@ -626,7 +659,7 @@ index 40fc7e6..68c2549 100644
/*
* GPG2 wants 64kB of mlocked memory, to make sure pass phrases
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 75e6e60..0bce489 100644
+index 6f7bba9..ffbcf8c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -102,6 +102,9 @@ struct fs_struct;
@@ -639,7 +672,7 @@ index 75e6e60..0bce489 100644
/*
* List of flags we want to share for kernel threads,
* if only because they are not used by them anyway.
-@@ -378,6 +381,10 @@ extern int sysctl_max_map_count;
+@@ -382,6 +385,10 @@ extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
unsigned long, unsigned long);
@@ -651,10 +684,10 @@ index 75e6e60..0bce489 100644
arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 0d949c5..12ca319 100644
+index 8a68b24..2c605b1 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -88,6 +88,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -87,6 +87,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
#ifndef CONFIG_MMU
extern int sysctl_nr_trim_pages;
#endif
@@ -681,7 +714,7 @@ index 0d949c5..12ca319 100644
#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -430,6 +430,14 @@ static struct ctl_table kern_table[] = {
+@@ -410,6 +430,14 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
@@ -697,10 +730,10 @@ index 0d949c5..12ca319 100644
{
.procname = "tainted",
diff --git a/mm/mmap.c b/mm/mmap.c
-index 73f5e4b..814b95f 100644
+index ee22989..5bc99f8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -29,6 +29,7 @@
+@@ -28,6 +28,7 @@
#include <linux/rmap.h>
#include <linux/mmu_notifier.h>
#include <linux/perf_event.h>
@@ -708,7 +741,7 @@ index 73f5e4b..814b95f 100644
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -45,6 +46,18 @@
+@@ -44,6 +45,18 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -727,7 +760,7 @@ index 73f5e4b..814b95f 100644
static void unmap_region(struct mm_struct *mm,
struct vm_area_struct *vma, struct vm_area_struct *prev,
unsigned long start, unsigned long end);
-@@ -389,6 +402,8 @@ static inline void
+@@ -388,6 +401,8 @@ static inline void
__vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
struct vm_area_struct *prev, struct rb_node *rb_parent)
{
@@ -736,7 +769,7 @@ index 73f5e4b..814b95f 100644
if (prev) {
vma->vm_next = prev->vm_next;
prev->vm_next = vma;
-@@ -491,6 +506,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -490,6 +505,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
rb_erase(&vma->vm_rb, &mm->mm_rb);
if (mm->mmap_cache == vma)
mm->mmap_cache = prev;
@@ -745,7 +778,7 @@ index 73f5e4b..814b95f 100644
}
/*
-@@ -798,6 +815,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -797,6 +814,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
} else /* cases 2, 5, 7 */
vma_adjust(prev, prev->vm_start,
end, prev->vm_pgoff, NULL);
@@ -754,7 +787,7 @@ index 73f5e4b..814b95f 100644
return prev;
}
-@@ -970,7 +989,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -947,7 +966,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
/* Obtain the address to map to. we verify (or select) it and ensure
* that it represents a valid section of the address space.
*/
@@ -764,7 +797,7 @@ index 73f5e4b..814b95f 100644
if (addr & ~PAGE_MASK)
return addr;
-@@ -1499,8 +1499,8 @@ void arch_unmap_area_topdown(struct mm_s
+@@ -1479,8 +1499,8 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -775,7 +808,7 @@ index 73f5e4b..814b95f 100644
{
unsigned long (*get_area)(struct file *, unsigned long,
unsigned long, unsigned long, unsigned long);
-@@ -1513,7 +1513,11 @@ get_unmapped_area(struct file *file, uns
+@@ -1493,7 +1513,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
if (len > TASK_SIZE)
return -ENOMEM;
@@ -788,7 +821,7 @@ index 73f5e4b..814b95f 100644
if (file && file->f_op && file->f_op->get_unmapped_area)
get_area = file->f_op->get_unmapped_area;
addr = get_area(file, addr, len, pgoff, flags);
-@@ -1473,8 +1497,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1507,8 +1531,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
return arch_rebalance_pgtables(addr, len);
}
@@ -866,7 +899,7 @@ index 73f5e4b..814b95f 100644
/* Look up the first VMA which satisfies addr < vm_end, NULL if none. */
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1549,6 +1641,14 @@ out:
+@@ -1583,6 +1675,14 @@ out:
return prev ? prev->vm_next : vma;
}
@@ -881,7 +914,7 @@ index 73f5e4b..814b95f 100644
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1565,7 +1665,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1599,7 +1699,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
@@ -890,7 +923,7 @@ index 73f5e4b..814b95f 100644
return -ENOMEM;
/* mlock limit tests */
-@@ -1875,10 +1975,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1906,10 +2006,14 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
@@ -907,7 +940,7 @@ index 73f5e4b..814b95f 100644
vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
return 0;
-@@ -2128,6 +2232,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2176,6 +2280,7 @@ void exit_mmap(struct mm_struct *mm)
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
@@ -953,9 +986,11 @@ index 8bc969d..3c9b4fc 100644
mmu_notifier_invalidate_range_start(mm, start, end);
if (is_vm_hugetlb_page(vma))
hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
---- linux-2.6.32.noarch/mm/mremap.c~ 2010-01-11 16:27:24.000000000 -0500
-+++ linux-2.6.32.noarch/mm/mremap.c 2010-01-11 16:27:54.000000000 -0500
-@@ -485,10 +485,10 @@ unsigned long do_mremap(unsigned long ad
+diff --git a/mm/mremap.c b/mm/mremap.c
+index 8451908..d5de807 100644
+--- a/mm/mremap.c
++++ b/mm/mremap.c
+@@ -485,10 +485,10 @@ unsigned long do_mremap(unsigned long addr,
if (vma->vm_flags & VM_MAYSHARE)
map_flags |= MAP_SHARED;
@@ -968,3 +1003,6 @@ index 8bc969d..3c9b4fc 100644
if (new_addr & ~PAGE_MASK) {
ret = new_addr;
goto out;
+--
+1.6.5.2
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1114
retrieving revision 1.1115
diff -u -p -r1.1114 -r1.1115
--- sources 16 Jan 2010 21:17:00 -0000 1.1114
+++ sources 18 Jan 2010 19:43:39 -0000 1.1115
@@ -1,3 +1,3 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
19c491f5ec00dbc96309044c784cde65 patch-2.6.33-rc4.bz2
-aecee770e751a3b86906b778696a99aa patch-2.6.33-rc4-git3.bz2
+e967a34157230ee40b836f467167bbbe patch-2.6.33-rc4-git6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1027
retrieving revision 1.1028
diff -u -p -r1.1027 -r1.1028
--- upstream 16 Jan 2010 21:17:00 -0000 1.1027
+++ upstream 18 Jan 2010 19:43:39 -0000 1.1028
@@ -1,3 +1,3 @@
linux-2.6.32.tar.bz2
patch-2.6.33-rc4.bz2
-patch-2.6.33-rc4-git3.bz2
+patch-2.6.33-rc4-git6.bz2
--- patch-2.6.33-rc4-git3.bz2.sign DELETED ---
More information about the scm-commits
mailing list