rpms/kernel/devel patch-2.6.28-git14.bz2.sign, NONE, 1.1 .cvsignore, 1.986, 1.987 config-generic, 1.217, 1.218 kernel.spec, 1.1204, 1.1205 linux-2.6-execshield.patch, 1.100, 1.101 sources, 1.948, 1.949 upstream, 1.860, 1.861 linux-2.6-squashfs.patch, 1.32, NONE patch-2.6.28-git13.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Sat Jan 10 07:46:42 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25975
Modified Files:
.cvsignore config-generic kernel.spec
linux-2.6-execshield.patch sources upstream
Added Files:
patch-2.6.28-git14.bz2.sign
Removed Files:
linux-2.6-squashfs.patch patch-2.6.28-git13.bz2.sign
Log Message:
* Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git14
- Rebased patches:
linux-2.6-execshield.patch: simple sysctl reject
- Deleted patches:
linux-2.6-squashfs.patch: upstream!
--- NEW FILE patch-2.6.28-git14.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJZ+lSyGugalF9Dw4RAjuOAJ0UBbJQZUJ6aUdVKlZqMZss/4V2XgCdGmdj
+eBYhEv5CQ3pzP+N/GBQDjo=
=OP2/
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- .cvsignore 9 Jan 2009 16:43:22 -0000 1.986
+++ .cvsignore 10 Jan 2009 07:46:11 -0000 1.987
@@ -4,4 +4,4 @@
temp-*
kernel-2.6.28
linux-2.6.28.tar.bz2
-patch-2.6.28-git13.bz2
+patch-2.6.28-git14.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- config-generic 9 Jan 2009 21:33:41 -0000 1.217
+++ config-generic 10 Jan 2009 07:46:11 -0000 1.218
@@ -276,6 +276,10 @@
# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
#
# Parallel port support
#
@@ -1597,6 +1601,8 @@
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_MISDN_HFCUSB=m
+
CONFIG_ISDN_PPP=y
CONFIG_ISDN_PPP_VJ=y
CONFIG_ISDN_MPP=y
@@ -3413,6 +3419,7 @@
CONFIG_FB_ATY128_BACKLIGHT=y
CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_LCD_CLASS_DEVICE=m
CONFIG_LCD_PLATFORM=m
@@ -3645,6 +3652,8 @@
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_WM8350=m
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -3874,3 +3883,7 @@
CONFIG_DVB_DYNAMIC_MINORS=y
CONFIG_DVB_LGDT3304=m
CONFIG_DVB_S921=m
+
+CONFIG_BTRFS_FS=m
+
+CONFIG_X86_PLATFORM_DEVICES=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1204
retrieving revision 1.1205
diff -u -r1.1204 -r1.1205
--- kernel.spec 9 Jan 2009 18:59:55 -0000 1.1204
+++ kernel.spec 10 Jan 2009 07:46:11 -0000 1.1205
@@ -57,7 +57,7 @@
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 13
+%define gitrev 14
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -614,7 +614,6 @@
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-Patch420: linux-2.6-squashfs.patch
Patch430: linux-2.6-net-silence-noisy-printks.patch
Patch450: linux-2.6-input-kill-stupid-messages.patch
Patch460: linux-2.6-serial-460800.patch
@@ -1062,9 +1061,6 @@
# bugfixes to drivers and filesystems
#
-# Squashfs
-ApplyPatch linux-2.6-squashfs.patch
-
# ext4
# xfs
@@ -1752,6 +1748,13 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-git14
+- Rebased patches:
+ linux-2.6-execshield.patch: simple sysctl reject
+- Deleted patches:
+ linux-2.6-squashfs.patch: upstream!
+
* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git12
- Revert ihex2fb moving patch, causes noarch target to
linux-2.6-execshield.patch:
Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- linux-2.6-execshield.patch 29 Dec 2008 03:27:27 -0000 1.100
+++ linux-2.6-execshield.patch 10 Jan 2009 07:46:11 -0000 1.101
@@ -1,5 +1,5 @@
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..c314884 100644
+index dc27705..6aa5630 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
#define write_ldt_entry(dt, entry, desc) \
native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -379,6 +383,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
}
@@ -97,10 +97,10 @@
{
PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 5ca01e3..4f319b1 100644
+index 091cd88..b1a6f6d 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
@@ -111,10 +111,10 @@
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 b9c9ea0..666dd0e 100644
+index 3f95a40..2c2893a 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
-@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -688,6 +688,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
* we do "generic changes."
*/
@@ -151,10 +151,10 @@
.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 0a1302f..ab96a10 100644
+index 3ba155d..09ae04c 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
-@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -356,6 +356,10 @@ 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;
@@ -165,7 +165,7 @@
/*
* Free the old FP and other extended state
*/
-@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -523,7 +527,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
__unlazy_fpu(prev_p);
@@ -175,7 +175,7 @@
/* we're going to use this soon, after a few expensive things */
if (next_p->fpu_counter > 5)
-@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -696,3 +701,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
unsigned long range_end = mm->brk + 0x02000000;
return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
}
@@ -216,7 +216,7 @@
+ set_user_cs(&mm->context.user_cs, 0);
+}
diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index f4049f3..e7a1b7c 100644
+index ce50546..bd6593a 100644
--- a/arch/x86/kernel/tlb_32.c
+++ b/arch/x86/kernel/tlb_32.c
@@ -2,6 +2,7 @@
@@ -227,7 +227,7 @@
#include <asm/tlbflush.h>
DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
unsigned long cpu;
cpu = get_cpu();
@@ -237,10 +237,10 @@
if (!cpu_isset(cpu, flush_cpumask))
goto out;
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..bb52785 100644
+index c9a666c..b702c77 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+@@ -157,6 +157,63 @@ static int lazy_iobitmap_copy(void)
return 0;
}
@@ -334,7 +334,7 @@
tsk->thread.error_code = error_code;
tsk->thread.trap_no = 13;
-@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -926,19 +1006,37 @@ do_device_not_available(struct pt_regs *regs, long error)
}
#ifdef CONFIG_X86_32
@@ -382,10 +382,10 @@
#endif
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index c483f42..8c3bbd9 100644
+index 88f1b10..1e31b5e 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
-@@ -570,7 +570,7 @@ static int disable_nx __initdata;
+@@ -575,7 +575,7 @@ static int disable_nx __initdata;
* Control non executable mappings.
*
* on Enable
@@ -394,7 +394,7 @@
*/
static int __init noexec_setup(char *str)
{
-@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
+@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str)
__supported_pte_mask |= _PAGE_NX;
disable_nx = 0;
}
@@ -415,7 +415,7 @@
return 0;
}
-@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
set_nx();
if (nx_enabled)
printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -449,10 +449,10 @@
}
}
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 513f330..2fb420a 100644
+index 1241f11..3f2c44c 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 exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
if (compat)
addr = VDSO_HIGH_BASE;
else {
@@ -462,10 +462,10 @@
ret = addr;
goto up_fail;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 5e4686d..b41f314 100644
+index bea2152..d750141 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
xen_mc_issue(PARAVIRT_LAZY_CPU);
}
@@ -490,7 +490,7 @@
static void xen_load_gdt(const struct desc_ptr *dtr)
{
unsigned long *frames;
-@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
.load_tr_desc = paravirt_nop,
.set_ldt = xen_set_ldt,
@@ -501,7 +501,7 @@
.load_idt = xen_load_idt,
.load_tls = xen_load_tls,
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 8fcfa39..5e1e2d8 100644
+index e3ff2b9..d46dcf2 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
@@ -513,7 +513,7 @@
static int set_brk(unsigned long start, unsigned long end)
{
-@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
break;
}
@@ -525,7 +525,7 @@
/* Some simple consistency checks for the interpreter */
if (elf_interpreter) {
retval = -ELIBBAD;
-@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
if (retval)
goto out_free_dentry;
@@ -541,7 +541,7 @@
/* OK, This is the point of no return */
current->flags &= ~PF_FORKNOEXEC;
current->mm->def_flags = def_flags;
-@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
/* Do this immediately, since STACK_TOP as used in setup_arg_pages
may depend on the personality. */
SET_PERSONALITY(loc->elf_ex);
@@ -551,7 +551,7 @@
current->personality |= READ_IMPLIES_EXEC;
if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
interpreter,
&interp_map_addr,
load_bias);
@@ -561,10 +561,10 @@
* load_elf_interp() returns relocation
* adjustment
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..bb98552 100644
+index 7e4877d..0c368c1 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
-@@ -412,8 +412,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
unlock_task_sighand(task, &flags);
}
@@ -584,10 +584,10 @@
min_flt = task->min_flt;
maj_flt = task->maj_flt;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ffee2f7..c14817b 100644
+index b91a73f..a0f6d93 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1123,7 +1123,13 @@ extern int install_special_mapping(struct mm_struct *mm,
unsigned long addr, unsigned long len,
unsigned long flags, struct page **pages);
@@ -603,10 +603,10 @@
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 fe82547..8007dbf 100644
+index 92915e8..4bfd050 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -177,6 +177,9 @@ struct mm_struct {
+@@ -194,6 +194,9 @@ struct mm_struct {
unsigned long (*get_unmapped_area) (struct file *filp,
unsigned long addr, unsigned long len,
unsigned long pgoff, unsigned long flags);
@@ -634,7 +634,7 @@
/*
* GPG2 wants 64kB of mlocked memory, to make sure pass phrases
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 55e30d1..d400ab0 100644
+index 4cae9b8..71fe593 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -98,6 +98,9 @@ struct robust_list_head;
@@ -647,7 +647,7 @@
/*
* List of flags we want to share for kernel threads,
* if only because they are not used by them anyway.
-@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
+@@ -343,6 +346,10 @@ extern int sysctl_max_map_count;
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
unsigned long, unsigned long);
@@ -659,13 +659,13 @@
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 3d56fe7..b512845 100644
+index 89d7443..6ea2333 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+ #ifndef CONFIG_MMU
+ extern int sysctl_nr_trim_pages;
+ #endif
+
+int exec_shield = (1<<0);
+/* exec_shield is a bitmask:
@@ -689,7 +689,7 @@
#ifdef CONFIG_RCU_TORTURE_TEST
extern int rcutorture_runnable;
#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
+@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec,
},
{
@@ -705,7 +705,7 @@
.procname = "core_uses_pid",
.data = &core_uses_pid,
diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..0850042 100644
+index 7496231..4cfb9fe 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -27,6 +27,7 @@
@@ -744,7 +744,7 @@
if (prev) {
vma->vm_next = prev->vm_next;
prev->vm_next = vma;
-@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,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;
@@ -753,7 +753,7 @@
}
/*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -799,6 +816,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);
@@ -762,7 +762,7 @@
return prev;
}
-@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -954,7 +973,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.
*/
@@ -772,7 +772,7 @@
if (addr & ~PAGE_MASK)
return addr;
-@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
}
unsigned long
@@ -793,7 +793,7 @@
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);
-@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
return arch_rebalance_pgtables(addr, len);
}
@@ -868,8 +868,8 @@
-EXPORT_SYMBOL(get_unmapped_area);
/* 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)
-@@ -1536,6 +1626,14 @@ out:
+ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -1535,6 +1625,14 @@ out:
return prev ? prev->vm_next : vma;
}
@@ -884,7 +884,7 @@
/*
* Verify that the stack growth is acceptable and
* update accounting. This is shared with both the
-@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1551,7 +1649,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
@@ -893,7 +893,7 @@
return -ENOMEM;
/* mlock limit tests */
-@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1959,14 @@ 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);
@@ -910,7 +910,7 @@
vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
return 0;
-@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2111,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
vm_unacct_memory(nr_accounted);
free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
tlb_finish_mmu(tlb, 0, end);
@@ -919,11 +919,11 @@
/*
* Walk the list again, actually closing and freeing it,
diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..cdfcbd2 100644
+index d0f6e7c..d51a400 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
-@@ -24,8 +24,15 @@
- #include <linux/mmu_notifier.h>
+@@ -25,8 +25,15 @@
+ #include <linux/migrate.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
@@ -938,7 +938,7 @@
#ifndef pgprot_modify
static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -138,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
struct mm_struct *mm = vma->vm_mm;
unsigned long oldflags = vma->vm_flags;
long nrpages = (end - start) >> PAGE_SHIFT;
@@ -947,7 +947,7 @@
pgoff_t pgoff;
int error;
int dirty_accountable = 0;
-@@ -204,6 +211,9 @@ success:
+@@ -202,6 +209,9 @@ success:
dirty_accountable = 1;
}
@@ -958,7 +958,7 @@
if (is_vm_hugetlb_page(vma))
hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
diff --git a/mm/mremap.c b/mm/mremap.c
-index 58a2908..5bb50e6 100644
+index 646de95..b77db03 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -r1.948 -r1.949
--- sources 9 Jan 2009 16:43:22 -0000 1.948
+++ sources 10 Jan 2009 07:46:12 -0000 1.949
@@ -1,2 +1,2 @@
d351e44709c9810b85e29b877f50968a linux-2.6.28.tar.bz2
-6259970262260a17e7812b0d9cabcd33 patch-2.6.28-git13.bz2
+423b6971fbd26d2140309825b8fb0748 patch-2.6.28-git14.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- upstream 9 Jan 2009 16:43:22 -0000 1.860
+++ upstream 10 Jan 2009 07:46:12 -0000 1.861
@@ -1,2 +1,2 @@
linux-2.6.28.tar.bz2
-patch-2.6.28-git13.bz2
+patch-2.6.28-git14.bz2
--- linux-2.6-squashfs.patch DELETED ---
--- patch-2.6.28-git13.bz2.sign DELETED ---
More information about the scm-commits
mailing list