packages (GRSECURITY_RAW): kernel/kernel-grsec_full.patch - http://www.grse...
mguevara
mguevara at pld-linux.org
Tue Dec 15 23:38:41 CET 2009
Author: mguevara Date: Tue Dec 15 22:38:41 2009 GMT
Module: packages Tag: GRSECURITY_RAW
---- Log message:
- http://www.grsecurity.net/~spender/grsecurity-2.1.14-2.6.31.7-200912111912.patch
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.3.2.25 -> 1.3.2.26)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.3.2.25 packages/kernel/kernel-grsec_full.patch:1.3.2.26
--- packages/kernel/kernel-grsec_full.patch:1.3.2.25 Sat Dec 12 21:14:30 2009
+++ packages/kernel/kernel-grsec_full.patch Tue Dec 15 23:38:27 2009
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32/arch/alpha/include/asm/atomic.h linux-2.6.32/arch/alpha/include/asm/atomic.h
---- linux-2.6.32/arch/alpha/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/include/asm/atomic.h 2009-12-04 21:40:47.326556174 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/include/asm/atomic.h linux-2.6.31.7/arch/alpha/include/asm/atomic.h
+--- linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
@@ -18,9 +18,11 @@
#define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } )
@@ -45,9 +45,9 @@
#define atomic64_inc(v) atomic64_add(1,(v))
#define atomic_dec(v) atomic_sub(1,(v))
-diff -urNp linux-2.6.32/arch/alpha/include/asm/elf.h linux-2.6.32/arch/alpha/include/asm/elf.h
---- linux-2.6.32/arch/alpha/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/include/asm/elf.h 2009-12-04 21:40:47.347546279 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/include/asm/elf.h linux-2.6.31.7/arch/alpha/include/asm/elf.h
+--- linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-12-11 19:08:06.291297436 -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 +62,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/arch/alpha/include/asm/pgtable.h linux-2.6.32/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32/arch/alpha/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/include/asm/pgtable.h 2009-12-04 21:40:47.348637902 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/include/asm/pgtable.h linux-2.6.31.7/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-12-11 19:08:06.291297436 -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 +83,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/arch/alpha/kernel/module.c linux-2.6.32/arch/alpha/kernel/module.c
---- linux-2.6.32/arch/alpha/kernel/module.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/kernel/module.c 2009-12-04 21:40:47.354638397 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/kernel/module.c linux-2.6.31.7/arch/alpha/kernel/module.c
+--- linux-2.6.31.7/arch/alpha/kernel/module.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/kernel/module.c 2009-12-11 19:08:06.291297436 -0500
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -95,9 +95,9 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32/arch/alpha/kernel/osf_sys.c linux-2.6.32/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32/arch/alpha/kernel/osf_sys.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/kernel/osf_sys.c 2009-12-04 21:40:47.356628108 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/kernel/osf_sys.c linux-2.6.31.7/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-12-11 19:08:06.291297436 -0500
@@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -120,9 +120,9 @@
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32/arch/alpha/mm/fault.c linux-2.6.32/arch/alpha/mm/fault.c
---- linux-2.6.32/arch/alpha/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/alpha/mm/fault.c 2009-12-04 21:40:47.362628200 -0500
+diff -urNp linux-2.6.31.7/arch/alpha/mm/fault.c linux-2.6.31.7/arch/alpha/mm/fault.c
+--- linux-2.6.31.7/arch/alpha/mm/fault.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/alpha/mm/fault.c 2009-12-11 19:08:06.291297436 -0500
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -279,20 +279,30 @@
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32/arch/arm/include/asm/atomic.h linux-2.6.32/arch/arm/include/asm/atomic.h
---- linux-2.6.32/arch/arm/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/include/asm/atomic.h 2009-12-04 21:40:47.399650149 -0500
-@@ -25,7 +25,9 @@
- * atomic_set() is the clrex or dummy strex done on every exception return.
- */
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/include/asm/atomic.h
+--- linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
+@@ -20,6 +20,7 @@
+ #ifdef __KERNEL__
+
#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
+@@ -44,6 +45,11 @@ static inline void atomic_set(atomic_t *
+ : "cc");
+ }
+
++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
++{
++ atomic_set((atomic_t *)v, i);
++}
++
+ static inline void atomic_add(int i, atomic_t *v)
+ {
+ unsigned long tmp;
+@@ -60,6 +66,11 @@ static inline void atomic_add(int i, ato
: "cc");
}
@@ -304,7 +314,7 @@
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
+@@ -98,6 +109,11 @@ static inline void atomic_sub(int i, ato
: "cc");
}
@@ -316,7 +326,15 @@
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
+@@ -164,6 +180,7 @@ static inline void atomic_clear_mask(uns
+ #endif
+
+ #define atomic_set(v,i) (((v)->counter) = (i))
++#define atomic_set_unchecked(v,i) (((v)->counter) = (i))
+
+ static inline int atomic_add_return(int i, atomic_t *v)
+ {
+@@ -232,6 +249,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)
@@ -324,10 +342,10 @@
#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/arch/arm/include/asm/elf.h linux-2.6.32/arch/arm/include/asm/elf.h
---- linux-2.6.32/arch/arm/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/include/asm/elf.h 2009-12-04 21:40:47.406615901 -0500
-@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/elf.h linux-2.6.31.7/arch/arm/include/asm/elf.h
+--- linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-12-11 19:08:06.291297436 -0500
+@@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con
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 +361,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/arch/arm/include/asm/kmap_types.h linux-2.6.32/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32/arch/arm/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/include/asm/kmap_types.h 2009-12-04 21:40:47.412193138 -0500
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/kmap_types.h linux-2.6.31.7/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-08 17:29:51.577600232 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-11 19:08:06.291297436 -0500
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -354,10 +372,10 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.32/arch/arm/include/asm/uaccess.h linux-2.6.32/arch/arm/include/asm/uaccess.h
---- linux-2.6.32/arch/arm/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/include/asm/uaccess.h 2009-12-04 21:40:47.413651000 -0500
-@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
+diff -urNp linux-2.6.31.7/arch/arm/include/asm/uaccess.h linux-2.6.31.7/arch/arm/include/asm/uaccess.h
+--- linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-12-11 19:08:06.291297436 -0500
+@@ -400,6 +400,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)
{
@@ -367,7 +385,7 @@
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else /* security hole - plug it */
-@@ -412,6 +415,9 @@ static inline unsigned long __must_check
+@@ -409,6 +412,9 @@ static inline unsigned long __must_check
static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -377,117 +395,21 @@
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32/arch/arm/kernel/kgdb.c linux-2.6.32/arch/arm/kernel/kgdb.c
---- linux-2.6.32/arch/arm/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/kernel/kgdb.c 2009-12-04 21:40:47.433493290 -0500
-@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
- * and we handle the normal undef case within the do_undefinstr
- * handler.
- */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- #ifndef __ARMEB__
- .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
- #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32/arch/arm/mach-at91/pm.c linux-2.6.32/arch/arm/mach-at91/pm.c
---- linux-2.6.32/arch/arm/mach-at91/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-at91/pm.c 2009-12-04 21:40:47.468230935 -0500
-@@ -348,7 +348,7 @@ static void at91_pm_end(void)
- }
-
-
--static struct platform_suspend_ops at91_pm_ops ={
-+static const struct platform_suspend_ops at91_pm_ops ={
- .valid = at91_pm_valid_state,
- .begin = at91_pm_begin,
- .enter = at91_pm_enter,
-diff -urNp linux-2.6.32/arch/arm/mach-omap1/pm.c linux-2.6.32/arch/arm/mach-omap1/pm.c
---- linux-2.6.32/arch/arm/mach-omap1/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-omap1/pm.c 2009-12-04 21:40:47.504127819 -0500
-@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
-
-
-
--static struct platform_suspend_ops omap_pm_ops ={
-+static const struct platform_suspend_ops omap_pm_ops ={
- .prepare = omap_pm_prepare,
- .enter = omap_pm_enter,
- .finish = omap_pm_finish,
-diff -urNp linux-2.6.32/arch/arm/mach-omap2/pm24xx.c linux-2.6.32/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32/arch/arm/mach-omap2/pm24xx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-omap2/pm24xx.c 2009-12-04 21:40:47.507645889 -0500
-@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
- enable_hlt();
- }
-
--static struct platform_suspend_ops omap_pm_ops = {
-+static const struct platform_suspend_ops omap_pm_ops = {
- .prepare = omap2_pm_prepare,
- .enter = omap2_pm_enter,
- .finish = omap2_pm_finish,
-diff -urNp linux-2.6.32/arch/arm/mach-omap2/pm34xx.c linux-2.6.32/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32/arch/arm/mach-omap2/pm34xx.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-omap2/pm34xx.c 2009-12-04 21:40:47.515527772 -0500
-@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
- return;
+diff -urNp linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c
+--- linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-12-11 19:08:06.291297436 -0500
+@@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode
+ return single_open(file, clk_debugfs_show, NULL);
}
--static struct platform_suspend_ops omap_pm_ops = {
-+static const struct platform_suspend_ops omap_pm_ops = {
- .begin = omap3_pm_begin,
- .end = omap3_pm_end,
- .prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32/arch/arm/mach-pnx4008/pm.c linux-2.6.32/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32/arch/arm/mach-pnx4008/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-pnx4008/pm.c 2009-12-04 21:40:47.530981648 -0500
-@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
- (state == PM_SUSPEND_MEM);
- }
-
--static struct platform_suspend_ops pnx4008_pm_ops = {
-+static const struct platform_suspend_ops pnx4008_pm_ops = {
- .enter = pnx4008_pm_enter,
- .valid = pnx4008_pm_valid,
- };
-diff -urNp linux-2.6.32/arch/arm/mach-pxa/pm.c linux-2.6.32/arch/arm/mach-pxa/pm.c
---- linux-2.6.32/arch/arm/mach-pxa/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-pxa/pm.c 2009-12-04 21:40:47.549606039 -0500
-@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
- pxa_cpu_pm_fns->finish();
- }
-
--static struct platform_suspend_ops pxa_pm_ops = {
-+static const struct platform_suspend_ops pxa_pm_ops = {
- .valid = pxa_pm_valid,
- .enter = pxa_pm_enter,
- .prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-04 21:40:47.556689149 -0500
-@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
- }
-
- #ifdef CONFIG_PM
--static struct platform_suspend_ops sharpsl_pm_ops = {
-+static const struct platform_suspend_ops sharpsl_pm_ops = {
- .prepare = pxa_pm_prepare,
- .finish = pxa_pm_finish,
- .enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32/arch/arm/mach-sa1100/pm.c linux-2.6.32/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32/arch/arm/mach-sa1100/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mach-sa1100/pm.c 2009-12-04 21:40:47.556689149 -0500
-@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
- return virt_to_phys(sp);
- }
-
--static struct platform_suspend_ops sa11x0_pm_ops = {
-+static const struct platform_suspend_ops sa11x0_pm_ops = {
- .enter = sa11x0_pm_enter,
- .valid = suspend_valid_only_mem,
- };
-diff -urNp linux-2.6.32/arch/arm/mm/mmap.c linux-2.6.32/arch/arm/mm/mmap.c
---- linux-2.6.32/arch/arm/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/mm/mmap.c 2009-12-04 21:40:47.557654415 -0500
+-static struct file_operations clk_debugfs_operations = {
++static const struct file_operations clk_debugfs_operations = {
+ .open = clk_debugfs_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+diff -urNp linux-2.6.31.7/arch/arm/mm/mmap.c linux-2.6.31.7/arch/arm/mm/mmap.c
+--- linux-2.6.31.7/arch/arm/mm/mmap.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/arm/mm/mmap.c 2009-12-11 19:08:06.291297436 -0500
@@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -524,21 +446,9 @@
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32/arch/arm/plat-s3c/pm.c linux-2.6.32/arch/arm/plat-s3c/pm.c
---- linux-2.6.32/arch/arm/plat-s3c/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/arm/plat-s3c/pm.c 2009-12-04 21:40:47.558675808 -0500
-@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
- s3c_pm_check_cleanup();
- }
-
--static struct platform_suspend_ops s3c_pm_ops = {
-+static const struct platform_suspend_ops s3c_pm_ops = {
- .enter = s3c_pm_enter,
- .prepare = s3c_pm_prepare,
- .finish = s3c_pm_finish,
-diff -urNp linux-2.6.32/arch/avr32/include/asm/atomic.h linux-2.6.32/arch/avr32/include/asm/atomic.h
---- linux-2.6.32/arch/avr32/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/avr32/include/asm/atomic.h 2009-12-04 21:40:47.558675808 -0500
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/atomic.h linux-2.6.31.7/arch/avr32/include/asm/atomic.h
+--- linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
@@ -20,7 +20,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -600,9 +510,9 @@
#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/arch/avr32/include/asm/elf.h linux-2.6.32/arch/avr32/include/asm/elf.h
---- linux-2.6.32/arch/avr32/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/avr32/include/asm/elf.h 2009-12-04 21:40:47.572658724 -0500
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/elf.h linux-2.6.31.7/arch/avr32/include/asm/elf.h
+--- linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-12-11 19:08:06.291297436 -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 +529,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/arch/avr32/include/asm/kmap_types.h linux-2.6.32/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32/arch/avr32/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/avr32/include/asm/kmap_types.h 2009-12-04 21:40:47.588771983 -0500
+diff -urNp linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-12-11 19:08:06.291297436 -0500
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -632,21 +542,9 @@
};
#undef D
-diff -urNp linux-2.6.32/arch/avr32/mach-at32ap/pm.c linux-2.6.32/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32/arch/avr32/mach-at32ap/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/avr32/mach-at32ap/pm.c 2009-12-04 21:40:47.592653565 -0500
-@@ -176,7 +176,7 @@ out:
- return 0;
- }
-
--static struct platform_suspend_ops avr32_pm_ops = {
-+static const struct platform_suspend_ops avr32_pm_ops = {
- .valid = avr32_pm_valid_state,
- .enter = avr32_pm_enter,
- };
-diff -urNp linux-2.6.32/arch/avr32/mm/fault.c linux-2.6.32/arch/avr32/mm/fault.c
---- linux-2.6.32/arch/avr32/mm/fault.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/avr32/mm/fault.c 2009-12-04 21:40:47.599660510 -0500
+diff -urNp linux-2.6.31.7/arch/avr32/mm/fault.c linux-2.6.31.7/arch/avr32/mm/fault.c
+--- linux-2.6.31.7/arch/avr32/mm/fault.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/avr32/mm/fault.c 2009-12-11 19:08:06.291297436 -0500
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -688,10 +586,10 @@
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/arch/blackfin/include/asm/atomic.h linux-2.6.32/arch/blackfin/include/asm/atomic.h
---- linux-2.6.32/arch/blackfin/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/blackfin/include/asm/atomic.h 2009-12-04 21:40:47.606655263 -0500
-@@ -21,8 +21,10 @@
+diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch/blackfin/include/asm/atomic.h
+--- linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
+@@ -15,8 +15,10 @@
#define ATOMIC_INIT(i) { (i) }
#define atomic_set(v, i) (((v)->counter) = i)
@@ -702,7 +600,7 @@
asmlinkage int __raw_uncached_fetch_asm(const volatile int *ptr);
-@@ -41,11 +43,21 @@ static inline void atomic_add(int i, ato
+@@ -35,11 +37,21 @@ static inline void atomic_add(int i, ato
__raw_atomic_update_asm(&v->counter, i);
}
@@ -724,7 +622,7 @@
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
+@@ -55,6 +67,11 @@ static inline void atomic_inc(volatile a
__raw_atomic_update_asm(&v->counter, 1);
}
@@ -736,33 +634,45 @@
static inline void atomic_dec(volatile atomic_t *v)
{
__raw_atomic_update_asm(&v->counter, -1);
-diff -urNp linux-2.6.32/arch/blackfin/kernel/kgdb.c linux-2.6.32/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32/arch/blackfin/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/blackfin/kernel/kgdb.c 2009-12-04 21:40:47.616037869 -0500
-@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
- return -1; /* this means that we do not want to exit from the handler */
+diff -urNp linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c
+--- linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-12-11 19:08:06.291297436 -0500
+@@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct
+ return ret;
}
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- .gdb_bpt_instr = {0xa1},
- #ifdef CONFIG_SMP
- .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32/arch/blackfin/mach-common/pm.c linux-2.6.32/arch/blackfin/mach-common/pm.c
---- linux-2.6.32/arch/blackfin/mach-common/pm.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/blackfin/mach-common/pm.c 2009-12-04 21:40:47.629659983 -0500
-@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
+-static struct file_operations coreb_fops = {
++static const struct file_operations coreb_fops = {
+ .owner = THIS_MODULE,
+ .ioctl = coreb_ioctl,
+ };
+diff -urNp linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c
+--- linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-12-11 19:08:06.291297436 -0500
+@@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha
+
+ #define NUMBER_OF_PORTS 2
+
+-static struct file_operations sync_serial_fops = {
++static const struct file_operations sync_serial_fops = {
+ .owner = THIS_MODULE,
+ .write = sync_serial_write,
+ .read = sync_serial_read,
+diff -urNp linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+--- linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-12-11 19:08:06.291297436 -0500
+@@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign
return 0;
}
--struct platform_suspend_ops bfin_pm_ops = {
-+const struct platform_suspend_ops bfin_pm_ops = {
- .enter = bfin_pm_enter,
- .valid = bfin_pm_valid,
- };
-diff -urNp linux-2.6.32/arch/cris/include/asm/atomic.h linux-2.6.32/arch/cris/include/asm/atomic.h
---- linux-2.6.32/arch/cris/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/cris/include/asm/atomic.h 2009-12-04 21:40:47.649929496 -0500
+-struct file_operations gpio_fops = {
++struct struct file_operations gpio_fops = {
+ .owner = THIS_MODULE,
+ .poll = gpio_poll,
+ .ioctl = gpio_ioctl,
+diff -urNp linux-2.6.31.7/arch/cris/include/asm/atomic.h linux-2.6.31.7/arch/cris/include/asm/atomic.h
+--- linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
@@ -16,7 +16,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -809,9 +719,9 @@
static inline void atomic_dec(volatile atomic_t *v)
{
unsigned long flags;
-diff -urNp linux-2.6.32/arch/frv/include/asm/atomic.h linux-2.6.32/arch/frv/include/asm/atomic.h
---- linux-2.6.32/arch/frv/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/frv/include/asm/atomic.h 2009-12-04 21:40:47.657761625 -0500
+diff -urNp linux-2.6.31.7/arch/frv/include/asm/atomic.h linux-2.6.31.7/arch/frv/include/asm/atomic.h
+--- linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
@@ -37,7 +37,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -854,9 +764,9 @@
static inline void atomic_dec(atomic_t *v)
{
atomic_sub_return(1, v);
-diff -urNp linux-2.6.32/arch/frv/include/asm/kmap_types.h linux-2.6.32/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32/arch/frv/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/frv/include/asm/kmap_types.h 2009-12-04 21:40:47.665664185 -0500
+diff -urNp linux-2.6.31.7/arch/frv/include/asm/kmap_types.h linux-2.6.31.7/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-12-11 19:08:06.291297436 -0500
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -865,9 +775,9 @@
KM_TYPE_NR
};
-diff -urNp linux-2.6.32/arch/h8300/include/asm/atomic.h linux-2.6.32/arch/h8300/include/asm/atomic.h
---- linux-2.6.32/arch/h8300/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/h8300/include/asm/atomic.h 2009-12-04 21:40:47.668686141 -0500
+diff -urNp linux-2.6.31.7/arch/h8300/include/asm/atomic.h linux-2.6.31.7/arch/h8300/include/asm/atomic.h
+--- linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-12-11 19:08:06.291297436 -0500
@@ -11,7 +11,9 @@
#define ATOMIC_INIT(i) { (i) }
@@ -920,51 +830,9 @@
/*
* atomic_inc_and_test - increment and test
-diff -urNp linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c 2009-12-04 21:40:47.681557744 -0500
-@@ -17,7 +17,7 @@
- #include <linux/swiotlb.h>
- #include <asm/machvec.h>
-
--extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
-+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
-
- /* swiotlb declarations & definitions: */
- extern int swiotlb_late_init_with_default_size (size_t size);
-@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev
- !sba_dma_ops.dma_supported(dev, *dev->dma_mask);
- }
-
--struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
-+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
- {
- if (use_swiotlb(dev))
- return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32/arch/ia64/hp/common/sba_iommu.c linux-2.6.32/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32/arch/ia64/hp/common/sba_iommu.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/ia64/hp/common/sba_iommu.c 2009-12-04 21:40:47.682723449 -0500
-@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
- },
- };
-
--extern struct dma_map_ops swiotlb_dma_ops;
-+extern const struct dma_map_ops swiotlb_dma_ops;
-
- static int __init
- sba_init(void)
-@@ -2191,7 +2191,7 @@ sba_page_override(char *str)
-
- __setup("sbapagesize=",sba_page_override);
-
--struct dma_map_ops sba_dma_ops = {
-+const struct dma_map_ops sba_dma_ops = {
- .alloc_coherent = sba_alloc_coherent,
- .free_coherent = sba_free_coherent,
- .map_page = sba_map_page,
-diff -urNp linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c 2009-12-02 22:51:21.000000000 -0500
-+++ linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c 2009-12-04 21:40:47.682723449 -0500
+diff -urNp linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-11-09 19:32:31.000000000 -0500
++++ linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-12-11 19:08:06.291297436 -0500
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.3.2.25&r2=1.3.2.26&f=u
More information about the pld-cvs-commit
mailing list