1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:41:53 +02:00

ixp4xx: add Mikael Petterssons patch works

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21894 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-06-24 14:38:03 +00:00
parent 75c6116c1e
commit 12c3f05a67
4 changed files with 76 additions and 0 deletions

View File

@ -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;

View File

@ -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.

View File

@ -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,

View File

@ -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);
}
/*