Author: mguevara Date: Tue Feb 2 12:58:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.6.32.7-1, updated grsec_full and vserver, small changes in
reiser4
---- Files affected:
packages/kernel:
kernel-grsec_fixes.patch (1.6 -> 1.7) , kernel-grsec_full.patch (1.27 ->
1.28) , kernel-reiser4.patch (1.9 -> 1.10) , kernel-vserver-2.3.patch (1.29 ->
1.30) , kernel.spec (1.748 -> 1.749)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.6
packages/kernel/kernel-grsec_fixes.patch:1.7
--- packages/kernel/kernel-grsec_fixes.patch:1.6 Wed Dec 16 17:03:17 2009
+++ packages/kernel/kernel-grsec_fixes.patch Tue Feb 2 13:58:20 2010
@@ -25,7 +25,7 @@
+}
--- a/grsecurity/grsec_sock.c 2008-03-24 00:24:22.482633101 +0100
+++ c/grsecurity/grsec_sock.c 2008-03-24 00:27:01.971671763 +0100
-@@ -247,23 +247,26 @@
+@@ -247,25 +247,26 @@
gr_cap_rtnetlink(struct sock *sock)
{
#ifdef CONFIG_GRKERNSEC
@@ -45,7 +45,9 @@
- gr_is_capable(CAP_AUDIT_CONTROL))
- return current_cap();
- else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
-- gr_is_capable(CAP_NET_ADMIN))
+- ((sock->sk_protocol == NETLINK_ROUTE) ?
+- gr_is_capable_nolog(CAP_NET_ADMIN) :
+- gr_is_capable(CAP_NET_ADMIN)))
- return current_cap();
- else
- return __cap_empty_set;
@@ -148,38 +150,3 @@
bool "Enable /proc page monitoring" if EMBEDDED
help
Various /proc files exist to monitor process memory utilization:
-
---- linux-2.6.32/fs/fuse/dev.c~ 2009-12-16 16:17:39.332389382 +0100
-+++ linux-2.6.32/fs/fuse/dev.c 2009-12-16 16:38:16.242858865 +0100
-@@ -831,6 +831,7 @@
- spin_unlock(&fc->lock);
- return err;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_read);
-
- static int fuse_notify_poll(struct fuse_conn *fc, unsigned int size,
- struct fuse_copy_state *cs)
-@@ -1093,6 +1094,7 @@
- fuse_copy_finish(&cs);
- return err;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_write);
-
- unsigned fuse_dev_poll(struct file *file, poll_table *wait)
- {
-@@ -1112,6 +1114,7 @@
-
- return mask;
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_poll);
-
- /*
- * Abort all requests on the given list (pending or processing)
-@@ -1229,6 +1232,7 @@
- /* No locking - fasync_helper does its own locking */
- return fasync_helper(fd, file, on, &fc->fasync);
- }
-+EXPORT_SYMBOL_GPL(fuse_dev_fasync);
-
- const struct file_operations fuse_dev_operations = {
- .owner = THIS_MODULE,
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.27
packages/kernel/kernel-grsec_full.patch:1.28
--- packages/kernel/kernel-grsec_full.patch:1.27 Thu Jan 7 09:19:48 2010
+++ packages/kernel/kernel-grsec_full.patch Tue Feb 2 13:58:20 2010
@@ -1,53 +1,6 @@
-diff -urNp linux-2.6.32.1/arch/alpha/include/asm/atomic.h
linux-2.6.32.1/arch/alpha/include/asm/atomic.h
---- linux-2.6.32.1/arch/alpha/include/asm/atomic.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/alpha/include/asm/atomic.h 2009-12-14
18:33:50.937708656 -0500
-@@ -18,9 +18,11 @@
- #define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
-
- #define atomic_read(v) ((v)->counter + 0)
-+#define atomic_read_unchecked(v) ((v)->counter + 0)
- #define atomic64_read(v) ((v)->counter + 0)
-
- #define atomic_set(v,i) ((v)->counter = (i))
-+#define atomic_set_unchecked(v,i) ((v)->counter = (i))
- #define atomic64_set(v,i) ((v)->counter = (i))
-
- /*
-@@ -44,6 +46,11 @@ static __inline__ void atomic_add(int i,
- :"Ir" (i), "m" (v->counter));
- }
-
-+static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t * v)
-+{
-+ atomic_add(i, (atomic_t *)v);
-+}
-+
- static __inline__ void atomic64_add(long i, atomic64_t * v)
- {
- unsigned long temp;
-@@ -74,6 +81,11 @@ static __inline__ void atomic_sub(int i,
- :"Ir" (i), "m" (v->counter));
- }
-
-+static __inline__ void atomic_sub_unchecked(int i, atomic_unchecked_t * v)
-+{
-+ atomic_sub(i, (atomic_t *)v);
-+}
-+
- static __inline__ void atomic64_sub(long i, atomic64_t * v)
- {
- unsigned long temp;
-@@ -246,6 +258,7 @@ static __inline__ int atomic64_add_unles
- #define atomic64_dec_and_test(v) (atomic64_sub_return(1, (v)) == 0)
-
- #define atomic_inc(v) atomic_add(1,(v))
-+#define atomic_inc_unchecked(v) atomic_add_unchecked(1,(v))
- #define atomic64_inc(v) atomic64_add(1,(v))
-
- #define atomic_dec(v) atomic_sub(1,(v))
-diff -urNp linux-2.6.32.1/arch/alpha/include/asm/elf.h
linux-2.6.32.1/arch/alpha/include/asm/elf.h
---- linux-2.6.32.1/arch/alpha/include/asm/elf.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/alpha/include/asm/elf.h 2009-12-14
18:33:50.937708656 -0500
+diff -urNp linux-2.6.32.7/arch/alpha/include/asm/elf.h
linux-2.6.32.7/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25
17:39:40.226974977 -0500
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -62,9 +15,9 @@
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.1/arch/alpha/include/asm/pgtable.h
linux-2.6.32.1/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.1/arch/alpha/include/asm/pgtable.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/alpha/include/asm/pgtable.h 2009-12-14
18:33:50.937708656 -0500
+diff -urNp linux-2.6.32.7/arch/alpha/include/asm/pgtable.h
linux-2.6.32.7/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25
17:39:40.227409538 -0500
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -83,9 +36,9 @@
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE |
_PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.1/arch/alpha/kernel/module.c
linux-2.6.32.1/arch/alpha/kernel/module.c
---- linux-2.6.32.1/arch/alpha/kernel/module.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/alpha/kernel/module.c 2009-12-14 18:33:50.938740017
-0500
+diff -urNp linux-2.6.32.7/arch/alpha/kernel/module.c
linux-2.6.32.7/arch/alpha/kernel/module.c
+--- linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 17:39:40.227409538
-0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -95,10 +48,10 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.1/arch/alpha/kernel/osf_sys.c
linux-2.6.32.1/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.1/arch/alpha/kernel/osf_sys.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/alpha/kernel/osf_sys.c 2009-12-14 18:33:50.955989565
-0500
-@@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.32.7/arch/alpha/kernel/osf_sys.c
linux-2.6.32.7/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 17:39:40.227409538
-0500
+@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -109,7 +62,7 @@
if (addr) {
addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
if (addr != (unsigned long) -ENOMEM)
-@@ -1219,8 +1223,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1212,8 +1216,8 @@ arch_get_unmapped_area(struct file *filp
}
/* Next, try allocating at TASK_UNMAPPED_BASE. */
@@ -120,9 +73,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.1/arch/alpha/mm/fault.c
linux-2.6.32.1/arch/alpha/mm/fault.c
---- linux-2.6.32.1/arch/alpha/mm/fault.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/alpha/mm/fault.c 2009-12-14 18:33:50.955989565
-0500
+diff -urNp linux-2.6.32.7/arch/alpha/mm/fault.c
linux-2.6.32.7/arch/alpha/mm/fault.c
+--- linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 17:39:40.228183006
-0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -279,54 +232,9 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.1/arch/arm/include/asm/atomic.h
linux-2.6.32.1/arch/arm/include/asm/atomic.h
---- linux-2.6.32.1/arch/arm/include/asm/atomic.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/include/asm/atomic.h 2009-12-14
18:33:51.013956117 -0500
-@@ -25,7 +25,9 @@
- * atomic_set() is the clrex or dummy strex done on every exception return.
- */
- #define atomic_read(v) ((v)->counter)
-+#define atomic_read_unchecked(v) ((v)->counter)
- #define atomic_set(v,i) (((v)->counter) = (i))
-+#define atomic_set_unchecked(v,i) (((v)->counter) = (i))
-
- #if __LINUX_ARM_ARCH__ >= 6
-
-@@ -50,6 +52,11 @@ static inline void atomic_add(int i, ato
- : "cc");
- }
-
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ atomic_add(i, (atomic_t *)v);
-+}
-+
- static inline int atomic_add_return(int i, atomic_t *v)
- {
- unsigned long tmp;
-@@ -88,6 +95,11 @@ static inline void atomic_sub(int i, ato
- : "cc");
- }
-
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ atomic_sub(i, (atomic_t *)v);
-+}
-+
- static inline int atomic_sub_return(int i, atomic_t *v)
- {
- unsigned long tmp;
-@@ -220,6 +232,7 @@ static inline int atomic_add_unless(atom
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
- #define atomic_inc(v) atomic_add(1, v)
-+#define atomic_inc_unchecked(v) atomic_add_unchecked(1, v)
- #define atomic_dec(v) atomic_sub(1, v)
-
- #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
-diff -urNp linux-2.6.32.1/arch/arm/include/asm/elf.h
linux-2.6.32.1/arch/arm/include/asm/elf.h
---- linux-2.6.32.1/arch/arm/include/asm/elf.h 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/include/asm/elf.h 2009-12-14 18:33:51.020967373
-0500
+diff -urNp linux-2.6.32.7/arch/arm/include/asm/elf.h
linux-2.6.32.7/arch/arm/include/asm/elf.h
+--- linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 17:39:40.228183006
-0500
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -343,9 +251,9 @@
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-diff -urNp linux-2.6.32.1/arch/arm/include/asm/kmap_types.h
linux-2.6.32.1/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.1/arch/arm/include/asm/kmap_types.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/include/asm/kmap_types.h 2009-12-14
18:33:51.020967373 -0500
+diff -urNp linux-2.6.32.7/arch/arm/include/asm/kmap_types.h
linux-2.6.32.7/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25
17:39:40.228183006 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -354,9 +262,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.1/arch/arm/include/asm/uaccess.h
linux-2.6.32.1/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.1/arch/arm/include/asm/uaccess.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/include/asm/uaccess.h 2009-12-14
18:33:51.020967373 -0500
+diff -urNp linux-2.6.32.7/arch/arm/include/asm/uaccess.h
linux-2.6.32.7/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25
17:39:40.228183006 -0500
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void
__user *from, unsigned long n)
@@ -377,9 +285,9 @@
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.1/arch/arm/kernel/kgdb.c
linux-2.6.32.1/arch/arm/kernel/kgdb.c
---- linux-2.6.32.1/arch/arm/kernel/kgdb.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/kernel/kgdb.c 2009-12-14 18:33:51.020967373
-0500
+diff -urNp linux-2.6.32.7/arch/arm/kernel/kgdb.c
linux-2.6.32.7/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 17:39:40.228183006
-0500
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -389,9 +297,9 @@
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.1/arch/arm/mach-at91/pm.c
linux-2.6.32.1/arch/arm/mach-at91/pm.c
---- linux-2.6.32.1/arch/arm/mach-at91/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/mach-at91/pm.c 2009-12-14 18:33:51.020967373
-0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-at91/pm.c
linux-2.6.32.7/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 17:39:40.228183006
-0500
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -401,9 +309,9 @@
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.1/arch/arm/mach-omap1/pm.c
linux-2.6.32.1/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.1/arch/arm/mach-omap1/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/mach-omap1/pm.c 2009-12-14 18:33:51.020967373
-0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-omap1/pm.c
linux-2.6.32.7/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 17:39:40.228183006
-0500
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -413,9 +321,9 @@
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.1/arch/arm/mach-omap2/pm24xx.c
linux-2.6.32.1/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.1/arch/arm/mach-omap2/pm24xx.c 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/mach-omap2/pm24xx.c 2009-12-14
18:33:51.140923568 -0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c
linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25
17:39:40.228183006 -0500
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -425,9 +333,9 @@
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.1/arch/arm/mach-omap2/pm34xx.c
linux-2.6.32.1/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.1/arch/arm/mach-omap2/pm34xx.c 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/mach-omap2/pm34xx.c 2009-12-14
18:33:51.153153597 -0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c
linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25
17:39:40.229409370 -0500
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -437,9 +345,9 @@
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.1/arch/arm/mach-pnx4008/pm.c
linux-2.6.32.1/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.1/arch/arm/mach-pnx4008/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/mach-pnx4008/pm.c 2009-12-14 18:33:51.153153597
-0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c
linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 17:39:40.229409370
-0500
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -449,9 +357,9 @@
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.1/arch/arm/mach-pxa/pm.c
linux-2.6.32.1/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.1/arch/arm/mach-pxa/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/mach-pxa/pm.c 2009-12-14 18:33:51.154149859
-0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/pm.c
linux-2.6.32.7/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 17:39:40.229409370
-0500
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -461,9 +369,9 @@
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.1/arch/arm/mach-pxa/sharpsl_pm.c
linux-2.6.32.1/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.1/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-14
18:33:51.171158507 -0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c
linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25
17:39:40.230112049 -0500
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -473,9 +381,9 @@
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.1/arch/arm/mach-sa1100/pm.c
linux-2.6.32.1/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.1/arch/arm/mach-sa1100/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/mach-sa1100/pm.c 2009-12-14 18:33:51.171158507
-0500
+diff -urNp linux-2.6.32.7/arch/arm/mach-sa1100/pm.c
linux-2.6.32.7/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 17:39:40.230112049
-0500
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -485,10 +393,10 @@
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.1/arch/arm/mm/mmap.c linux-2.6.32.1/arch/arm/mm/mmap.c
---- linux-2.6.32.1/arch/arm/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/arm/mm/mmap.c 2009-12-14 18:33:51.172149632 -0500
-@@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.32.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c
+--- linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 17:39:40.230112049 -0500
+@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -499,7 +407,7 @@
if (addr) {
if (do_align)
addr = COLOUR_ALIGN(addr, pgoff);
-@@ -74,10 +78,10 @@ arch_get_unmapped_area(struct file *filp
+@@ -75,10 +79,10 @@ arch_get_unmapped_area(struct file *filp
return addr;
}
if (len > mm->cached_hole_size) {
@@ -513,7 +421,7 @@
}
full_search:
-@@ -93,8 +97,8 @@ full_search:
+@@ -94,8 +98,8 @@ full_search:
* Start a new search - just in case we missed
* some holes.
*/
@@ -524,9 +432,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32.1/arch/arm/plat-s3c/pm.c
linux-2.6.32.1/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.1/arch/arm/plat-s3c/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/arm/plat-s3c/pm.c 2009-12-14 18:33:51.172149632
-0500
+diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c
linux-2.6.32.7/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 17:39:40.241617700
-0500
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -536,73 +444,9 @@
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.1/arch/avr32/include/asm/atomic.h
linux-2.6.32.1/arch/avr32/include/asm/atomic.h
---- linux-2.6.32.1/arch/avr32/include/asm/atomic.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/avr32/include/asm/atomic.h 2009-12-14
18:33:51.172149632 -0500
-@@ -20,7 +20,9 @@
- #define ATOMIC_INIT(i) { (i) }
-
- #define atomic_read(v) ((v)->counter)
-+#define atomic_read_unchecked(v) ((v)->counter)
- #define atomic_set(v, i) (((v)->counter) = i)
-+#define atomic_set_unchecked(v, i) (((v)->counter) = i)
-
- /*
- * atomic_sub_return - subtract the atomic variable
-@@ -48,6 +50,18 @@ static inline int atomic_sub_return(int
- }
-
- /*
-+ * atomic_sub_return_unchecked - subtract the atomic variable
-+ * @i: integer value to subtract
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically subtracts @i from @v. Returns the resulting value.
-+ */
-+static inline int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ return atomic_sub_return(i, (atomic_t *)v);
-+}
-+
-+/*
- * atomic_add_return - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
-@@ -76,6 +90,18 @@ static inline int atomic_add_return(int
- }
-
- /*
-+ * atomic_add_return_unchecked - add integer to atomic variable
-+ * @i: integer value to add
-+ * @v: pointer of type atomic_unchecked_t
-+ *
-+ * Atomically adds @i to @v. Returns the resulting value.
-+ */
-+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ return atomic_add_return(i, (atomic_t *)v);
-+}
-+
-+/*
- * atomic_sub_unless - sub unless the number is a given value
- * @v: pointer of type atomic_t
- * @a: the amount to add to v...
-@@ -176,9 +202,12 @@ static inline int atomic_sub_if_positive
- #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
-
- #define atomic_sub(i, v) (void)atomic_sub_return(i, v)
-+#define atomic_sub_unchecked(i, v) (void)atomic_sub_return_unchecked(i, v)
- #define atomic_add(i, v) (void)atomic_add_return(i, v)
-+#define atomic_add_unchecked(i, v) (void)atomic_add_return_unchecked(i, v)
- #define atomic_dec(v) atomic_sub(1, (v))
- #define atomic_inc(v) atomic_add(1, (v))
-+#define atomic_inc_unchecked(v) (void)atomic_add_return_unchecked(1,
(v))
-
- #define atomic_dec_return(v) atomic_sub_return(1, v)
- #define atomic_inc_return(v) atomic_add_return(1, v)
-diff -urNp linux-2.6.32.1/arch/avr32/include/asm/elf.h
linux-2.6.32.1/arch/avr32/include/asm/elf.h
---- linux-2.6.32.1/arch/avr32/include/asm/elf.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/avr32/include/asm/elf.h 2009-12-14
18:33:51.172149632 -0500
+diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h
linux-2.6.32.7/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25
17:39:40.241617700 -0500
@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -619,9 +463,9 @@
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-diff -urNp linux-2.6.32.1/arch/avr32/include/asm/kmap_types.h
linux-2.6.32.1/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.1/arch/avr32/include/asm/kmap_types.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/avr32/include/asm/kmap_types.h 2009-12-14
18:33:51.173167798 -0500
+diff -urNp linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h
linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25
13:50:10.000000000 -0500
++++ linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25
17:39:40.241617700 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -632,9 +476,9 @@
};
#undef D
-diff -urNp linux-2.6.32.1/arch/avr32/mach-at32ap/pm.c
linux-2.6.32.1/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.1/arch/avr32/mach-at32ap/pm.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/avr32/mach-at32ap/pm.c 2009-12-14 18:33:51.173167798
-0500
+diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c
linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 17:39:40.241617700
-0500
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -644,9 +488,9 @@
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.1/arch/avr32/mm/fault.c
linux-2.6.32.1/arch/avr32/mm/fault.c
---- linux-2.6.32.1/arch/avr32/mm/fault.c 2009-12-02 22:51:21.000000000
-0500
-+++ linux-2.6.32.1/arch/avr32/mm/fault.c 2009-12-14 18:33:51.173167798
-0500
+diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c
linux-2.6.32.7/arch/avr32/mm/fault.c
+--- linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 13:50:10.000000000
-0500
++++ linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 17:39:40.241617700
-0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -688,57 +532,9 @@
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.1/arch/blackfin/include/asm/atomic.h
linux-2.6.32.1/arch/blackfin/include/asm/atomic.h
---- linux-2.6.32.1/arch/blackfin/include/asm/atomic.h 2009-12-02
22:51:21.000000000 -0500
-+++ linux-2.6.32.1/arch/blackfin/include/asm/atomic.h 2009-12-14
18:33:51.173803102 -0500
-@@ -21,8 +21,10 @@
-
- #define ATOMIC_INIT(i) { (i) }
- #define atomic_set(v, i) (((v)->counter) = i)
-+#define atomic_set_unchecked(v, i) (((v)->counter) = i)
-
- #define atomic_read(v) __raw_uncached_fetch_asm(&(v)->counter)
-+#define atomic_read_unchecked(v) __raw_uncached_fetch_asm(&(v)->counter)
-
- asmlinkage int __raw_uncached_fetch_asm(const volatile int *ptr);
-
-@@ -41,11 +43,21 @@ static inline void atomic_add(int i, ato
- __raw_atomic_update_asm(&v->counter, i);
- }
-
-+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ atomic_add(i, (atomic_t *)v);
-+}
-+
- static inline void atomic_sub(int i, atomic_t *v)
- {
- __raw_atomic_update_asm(&v->counter, -i);
- }
-
-+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
-+{
-+ atomic_sub(i, (atomic_t *)v);
-+}
-+
- static inline int atomic_add_return(int i, atomic_t *v)
- {
- return __raw_atomic_update_asm(&v->counter, i);
-@@ -61,6 +73,11 @@ static inline void atomic_inc(volatile a
- __raw_atomic_update_asm(&v->counter, 1);
- }
-
-+static inline void atomic_inc_unchecked(volatile atomic_unchecked_t *v)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.27&r2=1.28&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-reiser4.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.748&r2=1.749&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
