[PATCH] s390: cleanup Kconfig
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:
committed by
Linus Torvalds
parent
9bbc8346fb
commit
347a8dc3b8
@@ -1603,7 +1603,7 @@ dumpit(char* buf, int len)
|
||||
__u32 ct, sw, rm, dup;
|
||||
char *ptr, *rptr;
|
||||
char tbuf[82], tdup[82];
|
||||
#if (CONFIG_ARCH_S390X)
|
||||
#if (CONFIG_64BIT)
|
||||
char addr[22];
|
||||
#else
|
||||
char addr[12];
|
||||
@@ -1619,7 +1619,7 @@ dumpit(char* buf, int len)
|
||||
dup = 0;
|
||||
for ( ct=0; ct < len; ct++, ptr++, rptr++ ) {
|
||||
if (sw == 0) {
|
||||
#if (CONFIG_ARCH_S390X)
|
||||
#if (CONFIG_64BIT)
|
||||
sprintf(addr, "%16.16lX",(unsigned long)rptr);
|
||||
#else
|
||||
sprintf(addr, "%8.8X",(__u32)rptr);
|
||||
@@ -1634,7 +1634,7 @@ dumpit(char* buf, int len)
|
||||
if (sw == 8) {
|
||||
strcat(bhex, " ");
|
||||
}
|
||||
#if (CONFIG_ARCH_S390X)
|
||||
#if (CONFIG_64BIT)
|
||||
sprintf(tbuf,"%2.2lX", (unsigned long)*ptr);
|
||||
#else
|
||||
sprintf(tbuf,"%2.2X", (__u32)*ptr);
|
||||
|
Reference in New Issue
Block a user