18 files changed, 50 insertions, 50 deletions

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 6e7d7b06421d..6f50cc9323d9 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,11 +1,11 @@
-if ARCH_S390
+if S390
 
 comment "S/390 block device drivers"
-        depends on ARCH_S390
+        depends on S390
 
 config BLK_DEV_XPRAM
         tristate "XPRAM disk support"
-        depends on ARCH_S390
+        depends on S390
         help
           Select this option if you want to use your expanded storage on S/390
           or zSeries as a disk.  This is useful as a _fast_ swap device if you
@@ -49,7 +49,7 @@ config DASD_FBA
 
 config DASD_DIAG
         tristate "Support for DIAG access to Disks"
-        depends on DASD && ( ARCH_S390X = 'n' || EXPERIMENTAL)
+        depends on DASD && ( 64BIT = 'n' || EXPERIMENTAL)
         help
           Select this option if you want to use Diagnose250 command to access
           Disks under VM.  If you are not running under VM or unsure what it is,
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1141a5963b67..041e1a621885 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -604,7 +604,7 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
 void
 dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device)
 {
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
         struct ccw1 *ccw;
 
         /* Clear any idals used for the request. */
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index a33d4064b537..ba80fdea7ebf 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -75,7 +75,7 @@ dia250(void *iob, int cmd)
         int rc;
 
         __asm__ __volatile__(
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
                 "       lghi    %0,3\n"
                 "       lgr     0,%3\n"
                 "       diag    0,%2,0x250\n"
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index 37edf6e91715..a4f80bd735f1 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -45,7 +45,7 @@ struct dasd_diag_characteristics {
 } __attribute__ ((packed, aligned(4)));
 
 
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
 #define DASD_DIAG_FLAGA_DEFAULT         DASD_DIAG_FLAGA_FORMAT_64BIT
 
 typedef u64 blocknum_t;
@@ -86,7 +86,7 @@ struct dasd_diag_rw_io {
         struct dasd_diag_bio *bio_list;
         u8  spare4[8];
 } __attribute__ ((packed, aligned(8)));
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
 #define DASD_DIAG_FLAGA_DEFAULT         0x0
 
 typedef u32 blocknum_t;
@@ -125,4 +125,4 @@ struct dasd_diag_rw_io {
         u32 interrupt_params;
         u8 spare3[20];
 } __attribute__ ((packed, aligned(8)));
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index efc4cf62496e..96eb48258580 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1041,7 +1041,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req)
                                 /* Eckd can only do full blocks. */
                                 return ERR_PTR(-EINVAL);
                         count += bv->bv_len >> (device->s2b_shift + 9);
-#if defined(CONFIG_ARCH_S390X)
+#if defined(CONFIG_64BIT)
                         if (idal_is_needed (page_address(bv->bv_page),
                                             bv->bv_len))
                                 cidaw += bv->bv_len >> (device->s2b_shift + 9);
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 9bac8d87a9cc..8ec75dc08e2c 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -271,7 +271,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
                                 /* Fba can only do full blocks. */
                                 return ERR_PTR(-EINVAL);
                         count += bv->bv_len >> (device->s2b_shift + 9);
-#if defined(CONFIG_ARCH_S390X)
+#if defined(CONFIG_64BIT)
                         if (idal_is_needed (page_address(bv->bv_page),
                                             bv->bv_len))
                                 cidaw += bv->bv_len / blksize;
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index d428c909b8a0..bf3a67c3cc5e 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -160,7 +160,7 @@ static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index)
                 "0: ipm   %0\n"
                 "   srl   %0,28\n"
                 "1:\n"
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
                 ".section __ex_table,\"a\"\n"
                 "   .align 4\n"
                 "   .long  0b,1b\n"
@@ -208,7 +208,7 @@ static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index)
                 "0: ipm   %0\n"
                 "   srl   %0,28\n"
                 "1:\n"
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
                 ".section __ex_table,\"a\"\n"
                 "   .align 4\n"
                 "   .long  0b,1b\n"
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 5473c23fcb52..5acc0ace3d7d 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -66,7 +66,7 @@ static int __diag288(enum vmwdt_func func, unsigned int timeout,
         __cmdl = len;
         err = 0;
         asm volatile (
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
                        "diag %2,%4,0x288\n"
                 "1:     \n"
                 ".section .fixup,\"ax\"\n"
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6f274f4f92eb..7376bc87206d 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -195,7 +195,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         sch->orb.spnd = sch->options.suspend;
         sch->orb.ssic = sch->options.suspend && sch->options.inter;
         sch->orb.lpm = (lpm != 0) ? (lpm & sch->opm) : sch->lpm;
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
         /*
          * for 64 bit we always support 64 bit IDAWs with 4k page size only
          */
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 3c77c3fd461d..04ceba343db8 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -27,7 +27,7 @@
 /*
  * diag210 is used under VM to get information about a virtual device
  */
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
 int
 diag210(struct diag210 * addr)
 {
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index 62b0e2ad507f..95a9462f9a91 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -50,7 +50,7 @@ static inline int stsch_err(struct subchannel_id schid,
                 "0:  ipm  %0\n"
                 "    srl  %0,28\n"
                 "1:\n"
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
                 ".section __ex_table,\"a\"\n"
                 "   .align 8\n"
                 "   .quad 0b,1b\n"
@@ -95,7 +95,7 @@ static inline int msch_err(struct subchannel_id schid,
                 "0:  ipm  %0\n"
                 "    srl  %0,28\n"
                 "1:\n"
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
                 ".section __ex_table,\"a\"\n"
                 "   .align 8\n"
                 "   .quad 0b,1b\n"
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 035c77af9cd3..30a836ffc31f 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -2394,7 +2394,7 @@ tiqdio_check_chsc_availability(void)
         sprintf(dbf_text,"hydrati%1x", hydra_thinints);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
 
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
         /* Check for QEBSM support in general (bit 58). */
         is_passthrough = css_general_characteristics.qebsm;
 #endif
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 43b840af5300..fa385e761fe1 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -271,7 +271,7 @@ static inline int
 do_sqbs(unsigned long sch, unsigned char state, int queue,
        unsigned int *start, unsigned int *count)
 {
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
        register unsigned long _ccq asm ("0") = *count;
        register unsigned long _sch asm ("1") = sch;
        unsigned long _queuestart = ((unsigned long)queue << 32) | *start;
@@ -295,7 +295,7 @@ static inline int
 do_eqbs(unsigned long sch, unsigned char *state, int queue,
         unsigned int *start, unsigned int *count)
 {
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
         register unsigned long _ccq asm ("0") = *count;
         register unsigned long _sch asm ("1") = sch;
         unsigned long _queuestart = ((unsigned long)queue << 32) | *start;
@@ -323,7 +323,7 @@ do_siga_sync(struct subchannel_id schid, unsigned int mask1, unsigned int mask2)
 {
         int cc;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
         asm volatile (
                 "lhi    0,2     \n\t"
                 "lr     1,%1    \n\t"
@@ -336,7 +336,7 @@ do_siga_sync(struct subchannel_id schid, unsigned int mask1, unsigned int mask2)
                 : "d" (schid), "d" (mask1), "d" (mask2)
                 : "cc", "0", "1", "2", "3"
                 );
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
         asm volatile (
                 "lghi   0,2     \n\t"
                 "llgfr  1,%1    \n\t"
@@ -349,7 +349,7 @@ do_siga_sync(struct subchannel_id schid, unsigned int mask1, unsigned int mask2)
                 : "d" (schid), "d" (mask1), "d" (mask2)
                 : "cc", "0", "1", "2", "3"
                 );
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
         return cc;
 }
 
@@ -358,7 +358,7 @@ do_siga_input(struct subchannel_id schid, unsigned int mask)
 {
         int cc;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
         asm volatile (
                 "lhi    0,1     \n\t"
                 "lr     1,%1    \n\t"
@@ -370,7 +370,7 @@ do_siga_input(struct subchannel_id schid, unsigned int mask)
                 : "d" (schid), "d" (mask)
                 : "cc", "0", "1", "2", "memory"
                 );
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
         asm volatile (
                 "lghi   0,1     \n\t"
                 "llgfr  1,%1    \n\t"
@@ -382,7 +382,7 @@ do_siga_input(struct subchannel_id schid, unsigned int mask)
                 : "d" (schid), "d" (mask)
                 : "cc", "0", "1", "2", "memory"
                 );
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
         
         return cc;
 }
@@ -394,7 +394,7 @@ do_siga_output(unsigned long schid, unsigned long mask, __u32 *bb,
         int cc;
         __u32 busy_bit;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
         asm volatile (
                 "lhi    0,0     \n\t"
                 "lr     1,%2    \n\t"
@@ -424,7 +424,7 @@ do_siga_output(unsigned long schid, unsigned long mask, __u32 *bb,
                 "i" (QDIO_SIGA_ERROR_ACCESS_EXCEPTION)
                 : "cc", "0", "1", "2", "memory"
                 );
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
         asm volatile (
                 "llgfr  0,%5    \n\t"
                 "lgr    1,%2    \n\t"
@@ -449,7 +449,7 @@ do_siga_output(unsigned long schid, unsigned long mask, __u32 *bb,
                 "i" (QDIO_SIGA_ERROR_ACCESS_EXCEPTION), "d" (fc)
                 : "cc", "0", "1", "2", "memory"
                 );
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
         
         (*bb) = busy_bit;
         return cc;
@@ -461,21 +461,21 @@ do_clear_global_summary(void)
 
         unsigned long time;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
         asm volatile (
                 "lhi    1,3     \n\t"
                 ".insn  rre,0xb2650000,2,0      \n\t"
                 "lr     %0,3    \n\t"
                 : "=d" (time) : : "cc", "1", "2", "3"
                 );
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
         asm volatile (
                 "lghi   1,3     \n\t"
                 ".insn  rre,0xb2650000,2,0      \n\t"
                 "lgr    %0,3    \n\t"
                 : "=d" (time) : : "cc", "1", "2", "3"
                 );
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
         
         return time;
 }
@@ -542,11 +542,11 @@ struct qdio_perf_stats {
 
 #define MY_MODULE_STRING(x) #x
 
-#ifdef CONFIG_ARCH_S390X
+#ifdef CONFIG_64BIT
 #define QDIO_GET_ADDR(x) ((__u32)(unsigned long)x)
-#else /* CONFIG_ARCH_S390X */
+#else /* CONFIG_64BIT */
 #define QDIO_GET_ADDR(x) ((__u32)(long)x)
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
 
 struct qdio_q {
         volatile struct slsb slsb;
diff --git a/drivers/s390/crypto/z90hardware.c b/drivers/s390/crypto/z90hardware.c
index 7c3ed52e03e1..d7f7494a0cbe 100644
--- a/drivers/s390/crypto/z90hardware.c
+++ b/drivers/s390/crypto/z90hardware.c
@@ -785,7 +785,7 @@ testq(int q_nr, int *q_depth, int *dev_type, struct ap_status_word *stat)
         int ccode;
 
         asm volatile
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         ("      llgfr   0,%4            \n"
          "      slgr    1,1             \n"
          "      lgr     2,1             \n"
@@ -855,7 +855,7 @@ resetq(int q_nr, struct ap_status_word *stat_p)
         int ccode;
 
         asm volatile
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         ("      llgfr   0,%2            \n"
          "      lghi    1,1             \n"
          "      sll     1,24            \n"
@@ -921,7 +921,7 @@ sen(int msg_len, unsigned char *msg_ext, struct ap_status_word *stat)
         int ccode;
 
         asm volatile
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         ("      lgr     6,%3            \n"
          "      llgfr   7,%2            \n"
          "      llgt    0,0(6)          \n"
@@ -1000,7 +1000,7 @@ rec(int q_nr, int buff_l, unsigned char *rsp, unsigned char *id,
         int ccode;
 
         asm volatile
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         ("      llgfr   0,%2            \n"
          "      lgr     3,%4            \n"
          "      lgr     6,%3            \n"
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index a7efc394515e..548854754921 100644
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -1,5 +1,5 @@
 menu "S/390 network device drivers"
-        depends on NETDEVICES && ARCH_S390
+        depends on NETDEVICES && S390
 
 config LCS
         tristate "Lan Channel Station Interface"
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 6b63d21612ec..e70af7f39946 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -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);
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 7dad597ff86e..3bf466603512 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -246,7 +246,7 @@ s390_revalidate_registers(struct mci *mci)
                  */
                 kill_task = 1;
 
-#ifndef __s390x__
+#ifndef CONFIG_64BIT
         asm volatile("ld 0,0(%0)\n"
                      "ld 2,8(%0)\n"
                      "ld 4,16(%0)\n"
@@ -255,7 +255,7 @@ s390_revalidate_registers(struct mci *mci)
 #endif
 
         if (MACHINE_HAS_IEEE) {
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
                 fpt_save_area = &S390_lowcore.floating_pt_save_area;
                 fpt_creg_save_area = &S390_lowcore.fpt_creg_save_area;
 #else
@@ -314,7 +314,7 @@ s390_revalidate_registers(struct mci *mci)
                  */
                 s390_handle_damage("invalid control registers.");
         else
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
                 asm volatile("lctlg 0,15,0(%0)"
                              : : "a" (&S390_lowcore.cregs_save_area));
 #else
@@ -327,7 +327,7 @@ s390_revalidate_registers(struct mci *mci)
          * can't write something sensible into that register.
          */
 
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         /*
          * See if we can revalidate the TOD programmable register with its
          * old contents (should be zero) otherwise set it to zero.
@@ -384,7 +384,7 @@ s390_do_machine_check(struct pt_regs *regs)
                 if (mci->b) {
                         /* Processing backup -> verify if we can survive this */
                         u64 z_mcic, o_mcic, t_mcic;
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
                         z_mcic = (1ULL<<63 | 1ULL<<59 | 1ULL<<29);
                         o_mcic = (1ULL<<43 | 1ULL<<42 | 1ULL<<41 | 1ULL<<40 |
                                   1ULL<<36 | 1ULL<<35 | 1ULL<<34 | 1ULL<<32 |
diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c
index 87c2db1bd4f5..66da840c9316 100644
--- a/drivers/s390/sysinfo.c
+++ b/drivers/s390/sysinfo.c
@@ -106,7 +106,7 @@ static inline int stsi (void *sysinfo,
 {
         int cc, retv;
 
-#ifndef CONFIG_ARCH_S390X
+#ifndef CONFIG_64BIT
         __asm__ __volatile__ (  "lr\t0,%2\n"
                                 "\tlr\t1,%3\n"
                                 "\tstsi\t0(%4)\n"