lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] s390: cleanup Kconfig

Browse Source 
Sanitize some s390 Kconfig options.  We have ARCH_S390, ARCH_S390X,
ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT.  Replace these 6 options by
S390, 64BIT and COMPAT.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Martin Schwidefsky
2006-01-06 00:19:28 -08:00
committed by Linus Torvalds
parent 9bbc8346fb
commit 347a8dc3b8
60 changed files with 183 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/s390/mm/init.c
View File

@ -44,7 +44,7 @@ void diag10(unsigned long addr)
{
if (addr >= 0x7ff00000)
return;
#ifdef __s390x__
#ifdef CONFIG_64BIT
asm volatile (
" sam31\n"
" diag %0,%0,0x10\n"
@ -106,7 +106,7 @@ extern unsigned long __initdata zholes_size[];
* paging_init() sets up the page tables
*/
#ifndef CONFIG_ARCH_S390X
#ifndef CONFIG_64BIT
void __init paging_init(void)
{
pgd_t * pg_dir;
@ -175,7 +175,7 @@ void __init paging_init(void)
return;
}
#else /* CONFIG_ARCH_S390X */
#else /* CONFIG_64BIT */
void __init paging_init(void)
{
pgd_t * pg_dir;
@ -256,7 +256,7 @@ void __init paging_init(void)
return;
}
#endif /* CONFIG_ARCH_S390X */
#endif /* CONFIG_64BIT */
void __init mem_init(void)
{