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 /fs/proc | |
| parent | a74d70b63f1a0230831bcca3145d85ae016f9d4c (diff) | |
| parent | f133ecca9cbb31b5e6e9bda27cbe3034fbf656df (diff) | |
| download | linux-57ed609d4b64139b4d2cf5f3b4880a573a7905d2.tar.gz linux-57ed609d4b64139b4d2cf5f3b4880a573a7905d2.tar.bz2 linux-57ed609d4b64139b4d2cf5f3b4880a573a7905d2.zip | |
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 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 4ede550517a6..14def991d9dd 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -83,6 +83,9 @@ #include <linux/pid_namespace.h> #include <linux/fs_struct.h> #include <linux/slab.h> +#ifdef CONFIG_HARDWALL +#include <asm/hardwall.h> +#endif #include "internal.h" /* NOTE: @@ -2842,6 +2845,9 @@ static const struct pid_entry tgid_base_stuff[] = { #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif +#ifdef CONFIG_HARDWALL + INF("hardwall", S_IRUGO, proc_pid_hardwall), +#endif }; static int proc_tgid_base_readdir(struct file * filp, @@ -3181,6 +3187,9 @@ static const struct pid_entry tid_base_stuff[] = { #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tid_io_accounting), #endif +#ifdef CONFIG_HARDWALL + INF("hardwall", S_IRUGO, proc_pid_hardwall), +#endif }; static int proc_tid_base_readdir(struct file * filp, |