From 4e9e581aafb41cd1fb5d6e6de8d4cdc4d9cddb07 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 18 Aug 2011 20:07:59 +0100
Subject: [PATCH] --- yaml --- r: 273026 b: refs/heads/master c:
 445c5786c9ce02b6816bb11fd3394a134fa6d244 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/um/include/shared/tlb.h | 13 -------------
 trunk/arch/um/kernel/process.c     |  2 +-
 trunk/arch/um/kernel/tlb.c         |  1 -
 4 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/arch/um/include/shared/tlb.h

diff --git a/[refs] b/[refs]
index 1112c76e10df..92360dec3a68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75d053b701cc098d44b729c8266a2df5ca5206e
+refs/heads/master: 445c5786c9ce02b6816bb11fd3394a134fa6d244
diff --git a/trunk/arch/um/include/shared/tlb.h b/trunk/arch/um/include/shared/tlb.h
deleted file mode 100644
index 8a50ce117076..000000000000
--- a/trunk/arch/um/include/shared/tlb.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __TLB_H__
-#define __TLB_H__
-
-#include "um_mmu.h"
-
-extern void force_flush_all(void);
-
-#endif
diff --git a/trunk/arch/um/kernel/process.c b/trunk/arch/um/kernel/process.c
index 21c1ae7c3d75..db44142d126c 100644
--- a/trunk/arch/um/kernel/process.c
+++ b/trunk/arch/um/kernel/process.c
@@ -20,12 +20,12 @@
 #include <linux/threads.h>
 #include <asm/current.h>
 #include <asm/pgtable.h>
+#include <asm/mmu_context.h>
 #include <asm/uaccess.h>
 #include "as-layout.h"
 #include "kern_util.h"
 #include "os.h"
 #include "skas.h"
-#include "tlb.h"
 
 /*
  * This is a per-cpu array.  A processor only modifies its entry and it only
diff --git a/trunk/arch/um/kernel/tlb.c b/trunk/arch/um/kernel/tlb.c
index d1da8acd918b..11cadb225f0a 100644
--- a/trunk/arch/um/kernel/tlb.c
+++ b/trunk/arch/um/kernel/tlb.c
@@ -11,7 +11,6 @@
 #include "mem_user.h"
 #include "os.h"
 #include "skas.h"
-#include "tlb.h"
 
 struct host_vm_change {
 	struct host_vm_op {