cgroup: get rid of cgroup_freezer_frozen_exit()

[sfrench/cifs-2.6.git] / include / linux / hmm.h

diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index 66f9ebbb1df3ffb91120bcaae4987ced0781e98e..ad50b7b4f141ce7eeb22c46c3d2ef61c672919a8 100644 (file)
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -468,7 +468,7 @@ struct hmm_devmem_ops {
         * Note that mmap semaphore is held in read mode at least when this
         * callback occurs, hence the vma is valid upon callback entry.
         */
-       int (*fault)(struct hmm_devmem *devmem,
+       vm_fault_t (*fault)(struct hmm_devmem *devmem,
                     struct vm_area_struct *vma,
                     unsigned long addr,
                     const struct page *page,
@@ -511,7 +511,7 @@ struct hmm_devmem_ops {
  * chunk, as an optimization. It must, however, prioritize the faulting address
  * over all the others.
  */
-typedef int (*dev_page_fault_t)(struct vm_area_struct *vma,
+typedef vm_fault_t (*dev_page_fault_t)(struct vm_area_struct *vma,
                                unsigned long addr,
                                const struct page *page,
                                unsigned int flags,