diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/partitions/Kconfig | 2 | ||||
-rw-r--r-- | fs/proc/array.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig index 656bc43431b9..e227a04261ab 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig | |||
@@ -85,7 +85,7 @@ config ATARI_PARTITION | |||
85 | 85 | ||
86 | config IBM_PARTITION | 86 | config IBM_PARTITION |
87 | bool "IBM disk label and partition support" | 87 | bool "IBM disk label and partition support" |
88 | depends on PARTITION_ADVANCED && ARCH_S390 | 88 | depends on PARTITION_ADVANCED && S390 |
89 | help | 89 | help |
90 | Say Y here if you would like to be able to read the hard disk | 90 | Say Y here if you would like to be able to read the hard disk |
91 | partition table format used by IBM DASD disks operating under CMS. | 91 | partition table format used by IBM DASD disks operating under CMS. |
diff --git a/fs/proc/array.c b/fs/proc/array.c index 3e1239e4b303..5e9251f65317 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -308,7 +308,7 @@ int proc_pid_status(struct task_struct *task, char * buffer) | |||
308 | buffer = task_sig(task, buffer); | 308 | buffer = task_sig(task, buffer); |
309 | buffer = task_cap(task, buffer); | 309 | buffer = task_cap(task, buffer); |
310 | buffer = cpuset_task_status_allowed(task, buffer); | 310 | buffer = cpuset_task_status_allowed(task, buffer); |
311 | #if defined(CONFIG_ARCH_S390) | 311 | #if defined(CONFIG_S390) |
312 | buffer = task_show_regs(task, buffer); | 312 | buffer = task_show_regs(task, buffer); |
313 | #endif | 313 | #endif |
314 | return buffer - orig; | 314 | return buffer - orig; |