Merge tag 'for-f2fs-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

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

diff --git a/arch/powerpc/include/asm/powernv.h b/arch/powerpc/include/asm/powernv.h
index 0e9c2402dd208cb9637d9cac91efaaa76b2d4ad7..f62797702300db7589f441bfd756012843e4df10 100644 (file)
--- a/arch/powerpc/include/asm/powernv.h
+++ b/arch/powerpc/include/asm/powernv.h
@@ -11,9 +11,31 @@
 #define _ASM_POWERNV_H
 
 #ifdef CONFIG_PPC_POWERNV
+#define NPU2_WRITE 1
 extern void powernv_set_nmmu_ptcr(unsigned long ptcr);
+extern struct npu_context *pnv_npu2_init_context(struct pci_dev *gpdev,
+                       unsigned long flags,
+                       struct npu_context *(*cb)(struct npu_context *, void *),
+                       void *priv);
+extern void pnv_npu2_destroy_context(struct npu_context *context,
+                               struct pci_dev *gpdev);
+extern int pnv_npu2_handle_fault(struct npu_context *context, uintptr_t *ea,
+                               unsigned long *flags, unsigned long *status,
+                               int count);
 #else
 static inline void powernv_set_nmmu_ptcr(unsigned long ptcr) { }
+static inline struct npu_context *pnv_npu2_init_context(struct pci_dev *gpdev,
+                       unsigned long flags,
+                       struct npu_context *(*cb)(struct npu_context *, void *),
+                       void *priv) { return ERR_PTR(-ENODEV); }
+static inline void pnv_npu2_destroy_context(struct npu_context *context,
+                                       struct pci_dev *gpdev) { }
+
+static inline int pnv_npu2_handle_fault(struct npu_context *context,
+                                       uintptr_t *ea, unsigned long *flags,
+                                       unsigned long *status, int count) {
+       return -ENODEV;
+}
 #endif
 
 #endif /* _ASM_POWERNV_H */