1 diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild
2 --- linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100
3 +++ linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200
8 header-y += sv_addr_ag.h
9 header-y += sv_addr.agh
10 diff -Nur linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild
11 --- linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100
12 +++ linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200
16 header-y += cryptocop.h
17 diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild linux-2.6.32.65/arch/cris/include/asm/Kbuild
18 --- linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild 2014-12-13 15:16:21.000000000 +0100
19 +++ linux-2.6.32.65/arch/cris/include/asm/Kbuild 2015-05-20 10:39:33.000000000 +0200
21 include include/asm-generic/Kbuild.asm
23 -header-y += arch-v10/
24 -header-y += arch-v32/
25 +header-y += ../arch-v10/arch/
26 +header-y += ../arch-v32/arch/
28 header-y += ethernet.h
30 diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h linux-2.6.32.65/arch/cris/include/asm/pgtable.h
31 --- linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h 2014-12-13 15:16:21.000000000 +0100
32 +++ linux-2.6.32.65/arch/cris/include/asm/pgtable.h 2015-05-20 11:56:24.000000000 +0200
35 #include <arch/pgtable.h>
37 +#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
38 + remap_pfn_range(vma, vaddr, pfn, size, prot)
41 * The Linux memory management assumes a three-level page table setup. On
42 * CRIS, we use that, but "fold" the mid level into the top-level page
43 diff -Nur linux-2.6.32.65.orig/include/asm-generic/bug.h linux-2.6.32.65/include/asm-generic/bug.h
44 --- linux-2.6.32.65.orig/include/asm-generic/bug.h 2014-12-13 15:16:21.000000000 +0100
45 +++ linux-2.6.32.65/include/asm-generic/bug.h 2015-05-20 13:39:24.000000000 +0200
50 +#ifndef WARN_RATELIMIT
51 +#define WARN_RATELIMIT(condition, format...) ({ \
52 + int __ret_warn_on = !!(condition); \
53 + unlikely(__ret_warn_on); \
59 #define WARN(condition, format...) ({ \
60 int __ret_warn_on = !!(condition); \