diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:29:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 11:29:28 -0700 |
commit | 57ed609d4b64139b4d2cf5f3b4880a573a7905d2 (patch) | |
tree | d824e1ebd33b28c4ccc53e9074064db479b17dc7 /arch/tile/include/asm/hardwall.h | |
parent | a74d70b63f1a0230831bcca3145d85ae016f9d4c (diff) | |
parent | f133ecca9cbb31b5e6e9bda27cbe3034fbf656df (diff) | |
download | op-kernel-dev-57ed609d4b64139b4d2cf5f3b4880a573a7905d2.zip op-kernel-dev-57ed609d4b64139b4d2cf5f3b4880a573a7905d2.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: more /proc and /sys file support
Diffstat (limited to 'arch/tile/include/asm/hardwall.h')
-rw-r--r-- | arch/tile/include/asm/hardwall.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/tile/include/asm/hardwall.h b/arch/tile/include/asm/hardwall.h index 0bed3ec..2ac4228 100644 --- a/arch/tile/include/asm/hardwall.h +++ b/arch/tile/include/asm/hardwall.h @@ -40,6 +40,10 @@ #define HARDWALL_DEACTIVATE \ _IO(HARDWALL_IOCTL_BASE, _HARDWALL_DEACTIVATE) +#define _HARDWALL_GET_ID 4 +#define HARDWALL_GET_ID \ + _IO(HARDWALL_IOCTL_BASE, _HARDWALL_GET_ID) + #ifndef __KERNEL__ /* This is the canonical name expected by userspace. */ @@ -47,9 +51,14 @@ #else -/* Hook for /proc/tile/hardwall. */ -struct seq_file; -int proc_tile_hardwall_show(struct seq_file *sf, void *v); +/* /proc hooks for hardwall. */ +struct proc_dir_entry; +#ifdef CONFIG_HARDWALL +void proc_tile_hardwall_init(struct proc_dir_entry *root); +int proc_pid_hardwall(struct task_struct *task, char *buffer); +#else +static inline void proc_tile_hardwall_init(struct proc_dir_entry *root) {} +#endif #endif |