diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-10 14:50:08 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-10 14:50:08 +0530 |
| commit | bf5a56deb588e201d95f21c00257e88ac721f90b (patch) | |
| tree | d418c01fea425ea8063a6c0fb6f7119b301e135a /arch/arm/include | |
| parent | 3cfc0c8843cbc3f2c859d9eea1003834af6119e7 (diff) | |
| parent | b99662a653ac3d90bfada1bfc326d3138229860c (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/fuse.c
drivers/misc/Makefile
Change-Id: I300b925d78b31efe00c342190d8dbd50e2e81230
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mmu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h index 68870c776671..b4ffe9d5b526 100644 --- a/arch/arm/include/asm/mmu.h +++ b/arch/arm/include/asm/mmu.h @@ -13,6 +13,10 @@ typedef struct { #ifdef CONFIG_CPU_HAS_ASID #define ASID(mm) ((mm)->context.id & 255) + +/* init_mm.context.id_lock should be initialized. */ +#define INIT_MM_CONTEXT(name) \ + .context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock), #else #define ASID(mm) (0) #endif |