diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-31 16:58:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-31 16:58:52 +0200 |
| commit | ef4afcc4401e92982f4ffd3fae6a9a6745a98596 (patch) | |
| tree | 664aba7fdb59ca1c2782c8b8cf35f53e7e5c5c85 /include | |
| parent | ac43be5cbbaeb75b43eb2914e089f560f0529e34 (diff) | |
| parent | a00123deed0cd4f1bed1bb78e3ec42028384e0b6 (diff) | |
| download | lwn-ef4afcc4401e92982f4ffd3fae6a9a6745a98596.tar.gz lwn-ef4afcc4401e92982f4ffd3fae6a9a6745a98596.zip | |
Merge stable/linux-2.6.33.y into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/dma-mapping-common.h | 4 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h index e694263445f7..69206957b72c 100644 --- a/include/asm-generic/dma-mapping-common.h +++ b/include/asm-generic/dma-mapping-common.h @@ -131,7 +131,7 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev, debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir); } else - dma_sync_single_for_cpu(dev, addr, size, dir); + dma_sync_single_for_cpu(dev, addr + offset, size, dir); } static inline void dma_sync_single_range_for_device(struct device *dev, @@ -148,7 +148,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev, debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir); } else - dma_sync_single_for_device(dev, addr, size, dir); + dma_sync_single_for_device(dev, addr + offset, size, dir); } static inline void diff --git a/include/linux/sched.h b/include/linux/sched.h index a88462a32617..21947b587171 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1659,7 +1659,6 @@ struct task_struct { u64 preempt_timestamp_hist; #endif #endif /* CONFIG_TRACING */ - unsigned long stack_start; #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */ struct memcg_batch_info { int do_batch; /* incremented when batch uncharge started */ |