diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 11:25:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 11:25:55 +0800 |
| commit | 9b27d238e08f69c2e2b684e490750df6e6a1976c (patch) | |
| tree | cf952684009d1eb5bd123e733ac3ea8f440dd1ab /include | |
| parent | a0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d (diff) | |
| parent | e8f616ae4f32159f77e60f73a4267b5806c418bd (diff) | |
Merge tag 'v3.14.35' into linux-linaro-lsk-v3.14
This is the 3.14.35 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsnotify.h | 6 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 1c804b057fb1..7ee1774edee5 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -101,8 +101,10 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, new_dir_mask |= FS_ISDIR; } - fsnotify(old_dir, old_dir_mask, old_dir, FSNOTIFY_EVENT_INODE, old_name, fs_cookie); - fsnotify(new_dir, new_dir_mask, new_dir, FSNOTIFY_EVENT_INODE, new_name, fs_cookie); + fsnotify(old_dir, old_dir_mask, source, FSNOTIFY_EVENT_INODE, old_name, + fs_cookie); + fsnotify(new_dir, new_dir_mask, source, FSNOTIFY_EVENT_INODE, new_name, + fs_cookie); if (target) fsnotify_link_count(target); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index efe8d8a7c7ad..e34bce3781ee 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -447,6 +447,7 @@ extern const struct dev_pm_ops usb_hcd_pci_pm_ops; #endif /* CONFIG_PCI */ /* pci-ish (pdev null is ok) buffer alloc/mapping support */ +void usb_init_pool_max(void); int hcd_buffer_create(struct usb_hcd *hcd); void hcd_buffer_destroy(struct usb_hcd *hcd); |