Merge commit 'origin/master' into next

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / mmu-book3e.h

diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h
index c5363c3a720733ac3da0b4836f038dcaaba1af0c..7e74cff81d864556b12030da29805d590334fe9a 100644 (file)
--- a/arch/powerpc/include/asm/mmu-book3e.h
+++ b/arch/powerpc/include/asm/mmu-book3e.h
@@ -93,6 +93,8 @@
 
 #ifndef __ASSEMBLY__
 
+extern unsigned int tlbcam_index;
+
 typedef struct {
        unsigned int    id;
        unsigned int    active;