diff options
author | David Howells <dhowells@redhat.com> | 2012-03-28 13:30:02 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-03-28 13:30:02 -0400 |
commit | a0616cdebcfd575dcd4c46102d1b52fbb827fc29 (patch) | |
tree | 49c67a23f3bcdb72a94317ddeff65e450b574746 /arch/s390/include/asm/setup.h | |
parent | ae3a197e3d0bfe3f4bf1693723e82dc018c096f3 (diff) |
Disintegrate asm/system.h for S390
Disintegrate asm/system.h for S390.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-s390@vger.kernel.org
Diffstat (limited to 'arch/s390/include/asm/setup.h')
-rw-r--r-- | arch/s390/include/asm/setup.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 097183c70407..b21e46e5d4b8 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
@@ -140,6 +140,20 @@ extern char vmpoff_cmd[]; | |||
140 | #define NSS_NAME_SIZE 8 | 140 | #define NSS_NAME_SIZE 8 |
141 | extern char kernel_nss_name[]; | 141 | extern char kernel_nss_name[]; |
142 | 142 | ||
143 | #ifdef CONFIG_PFAULT | ||
144 | extern int pfault_init(void); | ||
145 | extern void pfault_fini(void); | ||
146 | #else /* CONFIG_PFAULT */ | ||
147 | #define pfault_init() ({-1;}) | ||
148 | #define pfault_fini() do { } while (0) | ||
149 | #endif /* CONFIG_PFAULT */ | ||
150 | |||
151 | extern void cmma_init(void); | ||
152 | |||
153 | extern void (*_machine_restart)(char *command); | ||
154 | extern void (*_machine_halt)(void); | ||
155 | extern void (*_machine_power_off)(void); | ||
156 | |||
143 | #else /* __ASSEMBLY__ */ | 157 | #else /* __ASSEMBLY__ */ |
144 | 158 | ||
145 | #ifndef __s390x__ | 159 | #ifndef __s390x__ |