aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/mmu.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 13:58:18 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 13:58:18 -0400
commit6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch)
treef1324a39f155375221ed88db0626f61b75c51db6 /arch/s390/include/asm/mmu.h
parentASoC: Store DC offset correction for wm_hubs devices in class W mode (diff)
parentASoC: Include cx20442 to SND_SOC_ALL_CODECS (diff)
downloadlinux-dev-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.tar.xz
linux-dev-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'arch/s390/include/asm/mmu.h')
-rw-r--r--arch/s390/include/asm/mmu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index 99e3409102b9..78522cdefdd4 100644
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -2,6 +2,8 @@
#define __MMU_H
typedef struct {
+ atomic_t attach_count;
+ unsigned int flush_mm;
spinlock_t list_lock;
struct list_head crst_list;
struct list_head pgtable_list;