From 7cf04396c56e6e8272eb7e1a22b7b71549989fed Mon Sep 17 00:00:00 2001
From: "Alexandros C. Couloumbis" <alex@ozo.com>
Date: Thu, 24 Jun 2010 14:38:03 +0000
Subject: ixp4xx: add Mikael Petterssons patch works

SVN-Revision: 21894
---
 .../patches-2.6.33/601-arm-dma_free_coherent.patch | 12 ++++++++
 .../603-arm-kluin-array-indexing.patch             | 33 ++++++++++++++++++++++
 .../604-arm-ixp4xx-sched_clock.patch               | 20 +++++++++++++
 .../605-arm-rmk-cache-flush-optim.patch            | 11 ++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 target/linux/ixp4xx/patches-2.6.33/601-arm-dma_free_coherent.patch
 create mode 100644 target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
 create mode 100644 target/linux/ixp4xx/patches-2.6.33/604-arm-ixp4xx-sched_clock.patch
 create mode 100644 target/linux/ixp4xx/patches-2.6.33/605-arm-rmk-cache-flush-optim.patch

(limited to 'target')

diff --git a/target/linux/ixp4xx/patches-2.6.33/601-arm-dma_free_coherent.patch b/target/linux/ixp4xx/patches-2.6.33/601-arm-dma_free_coherent.patch
new file mode 100644
index 0000000..b939705
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/601-arm-dma_free_coherent.patch
@@ -0,0 +1,12 @@
+--- a/arch/arm/mm/dma-mapping.c
++++ b/arch/arm/mm/dma-mapping.c
+@@ -384,7 +384,8 @@ EXPORT_SYMBOL(dma_mmap_writecombine);
+  */
+ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t handle)
+ {
+-	WARN_ON(irqs_disabled());
++	if (irqs_disabled()) /* don't want stack dumps for these! */
++		printk("WARNING: at %s:%d %s()\n", __FILE__, __LINE__, __FUNCTION__);
+ 
+ 	if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
+ 		return;
diff --git a/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch b/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
new file mode 100644
index 0000000..aca693a
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/603-arm-kluin-array-indexing.patch
@@ -0,0 +1,33 @@
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -322,12 +322,13 @@ static void __init setup_processor(void)
+ void cpu_init(void)
+ {
+ 	unsigned int cpu = smp_processor_id();
+-	struct stack *stk = &stacks[cpu];
++	struct stack *stk;
+ 
+ 	if (cpu >= NR_CPUS) {
+ 		printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu);
+ 		BUG();
+ 	}
++	stk = &stacks[cpu];
+ 
+ 	/*
+ 	 * Define the placement constraint for the inline asm directive below.
+@@ -386,13 +387,14 @@ static struct machine_desc * __init setu
+ 
+ static int __init arm_add_memory(unsigned long start, unsigned long size)
+ {
+-	struct membank *bank = &meminfo.bank[meminfo.nr_banks];
++	struct membank *bank;
+ 
+ 	if (meminfo.nr_banks >= NR_BANKS) {
+ 		printk(KERN_CRIT "NR_BANKS too low, "
+ 			"ignoring memory at %#lx\n", start);
+ 		return -EINVAL;
+ 	}
++	bank = &meminfo.bank[meminfo.nr_banks];
+ 
+ 	/*
+ 	 * Ensure that start/size are aligned to a page boundary.
diff --git a/target/linux/ixp4xx/patches-2.6.33/604-arm-ixp4xx-sched_clock.patch b/target/linux/ixp4xx/patches-2.6.33/604-arm-ixp4xx-sched_clock.patch
new file mode 100644
index 0000000..150f852
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/604-arm-ixp4xx-sched_clock.patch
@@ -0,0 +1,20 @@
+--- a/arch/arm/mach-ixp4xx/common.c
++++ b/arch/arm/mach-ixp4xx/common.c
+@@ -427,6 +427,17 @@ static void __init ixp4xx_clocksource_in
+ }
+ 
+ /*
++ * sched_clock()
++ */
++unsigned long long sched_clock(void)
++{
++	cycle_t cyc = ixp4xx_get_cycles(NULL);
++	struct clocksource *cs = &clocksource_ixp4xx;
++
++	return clocksource_cyc2ns(cyc, cs->mult, cs->shift);
++}
++
++/*
+  * clockevents
+  */
+ static int ixp4xx_set_next_event(unsigned long evt,
diff --git a/target/linux/ixp4xx/patches-2.6.33/605-arm-rmk-cache-flush-optim.patch b/target/linux/ixp4xx/patches-2.6.33/605-arm-rmk-cache-flush-optim.patch
new file mode 100644
index 0000000..31e0fb5
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.33/605-arm-rmk-cache-flush-optim.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/mm/fault-armv.c
++++ b/arch/arm/mm/fault-armv.c
+@@ -127,8 +127,6 @@ make_coherent(struct address_space *mapp
+ 	flush_dcache_mmap_unlock(mapping);
+ 	if (aliases)
+ 		adjust_pte(vma, addr);
+-	else
+-		flush_cache_page(vma, addr, pfn);
+ }
+ 
+ /*
-- 
cgit v1.1