diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 18:37:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 18:37:24 -0500 |
commit | 7c7758f99d39d529a64d4f60d22129bbf2f16d74 (patch) | |
tree | 8847b5e56812fe4c4c812cfffc78e391a91f4ebe /fs | |
parent | 67acd8b4b7a3f1b183ae358e1dfdb8a80e170736 (diff) | |
parent | 8a70da82edc50aa7a4b54864babf2d72538ba1bb (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (123 commits)
wimax/i2400m: add CREDITS and MAINTAINERS entries
wimax: export linux/wimax.h and linux/wimax/i2400m.h with headers_install
i2400m: Makefile and Kconfig
i2400m/SDIO: TX and RX path backends
i2400m/SDIO: firmware upload backend
i2400m/SDIO: probe/disconnect, dev init/shutdown and reset backends
i2400m/SDIO: header for the SDIO subdriver
i2400m/USB: TX and RX path backends
i2400m/USB: firmware upload backend
i2400m/USB: probe/disconnect, dev init/shutdown and reset backends
i2400m/USB: header for the USB bus driver
i2400m: debugfs controls
i2400m: various functions for device management
i2400m: RX and TX data/control paths
i2400m: firmware loading and bootrom initialization
i2400m: linkage to the networking stack
i2400m: Generic probe/disconnect, reset and message passing
i2400m: host/device procotol and core driver definitions
i2400m: documentation and instructions for usage
wimax: Makefile, Kconfig and docbook linkage for the stack
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/debugfs/file.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index 159a5efd6a8..33a90120f6a 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
@@ -294,6 +294,38 @@ struct dentry *debugfs_create_x32(const char *name, mode_t mode, | |||
294 | } | 294 | } |
295 | EXPORT_SYMBOL_GPL(debugfs_create_x32); | 295 | EXPORT_SYMBOL_GPL(debugfs_create_x32); |
296 | 296 | ||
297 | |||
298 | static int debugfs_size_t_set(void *data, u64 val) | ||
299 | { | ||
300 | *(size_t *)data = val; | ||
301 | return 0; | ||
302 | } | ||
303 | static int debugfs_size_t_get(void *data, u64 *val) | ||
304 | { | ||
305 | *val = *(size_t *)data; | ||
306 | return 0; | ||
307 | } | ||
308 | DEFINE_SIMPLE_ATTRIBUTE(fops_size_t, debugfs_size_t_get, debugfs_size_t_set, | ||
309 | "%llu\n"); /* %llu and %zu are more or less the same */ | ||
310 | |||
311 | /** | ||
312 | * debugfs_create_size_t - create a debugfs file that is used to read and write an size_t value | ||
313 | * @name: a pointer to a string containing the name of the file to create. | ||
314 | * @mode: the permission that the file should have | ||
315 | * @parent: a pointer to the parent dentry for this file. This should be a | ||
316 | * directory dentry if set. If this parameter is %NULL, then the | ||
317 | * file will be created in the root of the debugfs filesystem. | ||
318 | * @value: a pointer to the variable that the file should read to and write | ||
319 | * from. | ||
320 | */ | ||
321 | struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | ||
322 | struct dentry *parent, size_t *value) | ||
323 | { | ||
324 | return debugfs_create_file(name, mode, parent, value, &fops_size_t); | ||
325 | } | ||
326 | EXPORT_SYMBOL_GPL(debugfs_create_size_t); | ||
327 | |||
328 | |||
297 | static ssize_t read_file_bool(struct file *file, char __user *user_buf, | 329 | static ssize_t read_file_bool(struct file *file, char __user *user_buf, |
298 | size_t count, loff_t *ppos) | 330 | size_t count, loff_t *ppos) |
299 | { | 331 | { |