From 8353af86c2b5c72d5a59dd4b93971a0b608c1be1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 23 May 2015 01:43:32 +0200 Subject: add some cris patches --- target/linux/patches/2.6.32.65/cris-header.patch | 60 ++++++++++++++++++++++ .../linux/patches/2.6.32.65/cris-initramfs.patch | 22 ++++++++ target/linux/patches/4.0.3/cris-header.patch | 12 +++++ 3 files changed, 94 insertions(+) create mode 100644 target/linux/patches/2.6.32.65/cris-header.patch create mode 100644 target/linux/patches/2.6.32.65/cris-initramfs.patch create mode 100644 target/linux/patches/4.0.3/cris-header.patch diff --git a/target/linux/patches/2.6.32.65/cris-header.patch b/target/linux/patches/2.6.32.65/cris-header.patch new file mode 100644 index 000000000..1645d519c --- /dev/null +++ b/target/linux/patches/2.6.32.65/cris-header.patch @@ -0,0 +1,60 @@ +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 +--- linux-2.6.32.65.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/arch-v10/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 +@@ -1,4 +1,5 @@ + header-y += user.h ++header-y += ptrace.h + header-y += svinto.h + header-y += sv_addr_ag.h + header-y += sv_addr.agh +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 +--- linux-2.6.32.65.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/arch-v32/arch/Kbuild 2015-05-20 10:00:19.000000000 +0200 +@@ -1,2 +1,3 @@ + header-y += user.h ++header-y += ptrace.h + header-y += cryptocop.h +diff -Nur linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild linux-2.6.32.65/arch/cris/include/asm/Kbuild +--- linux-2.6.32.65.orig/arch/cris/include/asm/Kbuild 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/asm/Kbuild 2015-05-20 10:39:33.000000000 +0200 +@@ -1,7 +1,7 @@ + include include/asm-generic/Kbuild.asm + +-header-y += arch-v10/ +-header-y += arch-v32/ ++header-y += ../arch-v10/arch/ ++header-y += ../arch-v32/arch/ + + header-y += ethernet.h + header-y += rtc.h +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 +--- linux-2.6.32.65.orig/arch/cris/include/asm/pgtable.h 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/arch/cris/include/asm/pgtable.h 2015-05-20 11:56:24.000000000 +0200 +@@ -14,6 +14,9 @@ + #endif + #include + ++#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ ++ remap_pfn_range(vma, vaddr, pfn, size, prot) ++ + /* + * The Linux memory management assumes a three-level page table setup. On + * CRIS, we use that, but "fold" the mid level into the top-level page +diff -Nur linux-2.6.32.65.orig/include/asm-generic/bug.h linux-2.6.32.65/include/asm-generic/bug.h +--- linux-2.6.32.65.orig/include/asm-generic/bug.h 2014-12-13 15:16:21.000000000 +0100 ++++ linux-2.6.32.65/include/asm-generic/bug.h 2015-05-20 13:39:24.000000000 +0200 +@@ -119,6 +119,14 @@ + }) + #endif + ++#ifndef WARN_RATELIMIT ++#define WARN_RATELIMIT(condition, format...) ({ \ ++ int __ret_warn_on = !!(condition); \ ++ unlikely(__ret_warn_on); \ ++}) ++#endif ++ ++ + #ifndef WARN + #define WARN(condition, format...) ({ \ + int __ret_warn_on = !!(condition); \ diff --git a/target/linux/patches/2.6.32.65/cris-initramfs.patch b/target/linux/patches/2.6.32.65/cris-initramfs.patch new file mode 100644 index 000000000..b709e705e --- /dev/null +++ b/target/linux/patches/2.6.32.65/cris-initramfs.patch @@ -0,0 +1,22 @@ +diff -Nur linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c linux-3.18.12/arch/cris/arch-v10/mm/init.c +--- linux-3.18.12.orig/arch/cris/arch-v10/mm/init.c 2015-04-20 21:48:02.000000000 +0200 ++++ linux-3.18.12/arch/cris/arch-v10/mm/init.c 2015-05-16 01:46:37.000000000 +0200 +@@ -261,3 +261,7 @@ + { + flush_etrax_cacherange(0, 8192); + } ++ ++void free_initrd_mem(unsigned long start, unsigned long end) ++{ ++} +diff -Nur linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c linux-3.18.12/arch/cris/arch-v32/mm/init.c +--- linux-3.18.12.orig/arch/cris/arch-v32/mm/init.c 2015-04-20 21:48:02.000000000 +0200 ++++ linux-3.18.12/arch/cris/arch-v32/mm/init.c 2015-05-16 01:46:54.000000000 +0200 +@@ -171,3 +171,7 @@ + + mem_map = contig_page_data.node_mem_map; + } ++ ++void free_initrd_mem(unsigned long start, unsigned long end) ++{ ++} diff --git a/target/linux/patches/4.0.3/cris-header.patch b/target/linux/patches/4.0.3/cris-header.patch new file mode 100644 index 000000000..2b5a88461 --- /dev/null +++ b/target/linux/patches/4.0.3/cris-header.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild +--- linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild 2014-09-26 19:24:50.000000000 +0200 +@@ -1 +1,2 @@ + # CRISv10 arch ++header-y += ptrace.h +diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild +--- linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200 ++++ linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild 2014-09-26 19:24:31.000000000 +0200 +@@ -1 +1,2 @@ + # CRISv32 arch ++header-y += ptrace.h -- cgit v1.2.3