← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/include/asm/memory.h

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/include/asm/memory.h
209
209
 * allocations.  This must be the smallest DMA mask in the system,
210
210
 * so a successful GFP_DMA allocation will always satisfy this.
211
211
 */
212
 
#ifndef ISA_DMA_THRESHOLD
 
212
#ifndef ARM_DMA_ZONE_SIZE
213
213
#define ISA_DMA_THRESHOLD       (0xffffffffULL)
214
 
#endif
215
 
 
216
 
#ifndef arch_adjust_zones
217
 
#define arch_adjust_zones(size,holes) do { } while (0)
218
 
#elif !defined(CONFIG_ZONE_DMA)
219
 
#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"
 
214
#else
 
215
#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + ARM_DMA_ZONE_SIZE - 1)
220
216
#endif
221
217
 
222
218
/*