linux-next: manual merge of the s390 tree with Linus' tree

From: Stephen Rothwell
Date: Sat Feb 21 2015 - 19:27:26 EST

Hi all,

Today's linux-next merge of the s390 tree got a conflict in
arch/s390/kernel/early.c between commit 61b0b01686d4 ("s390/spinlock:
disabled compare-and-delay by default") from Linus' tree and commit
c5f43f0a70fc ("s390: remove 31 bit support") from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/s390/kernel/early.c
index 4427ab7ac23a,434b4d26a8db..000000000000
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@@ -393,19 -328,16 +328,18 @@@ static __init void detect_machine_facil
S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC;
if (test_facility(129))
S390_lowcore.machine_flags |= MACHINE_FLAG_VX;
- #endif
- if (test_facility(128))
- S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;

-static int __init nocad_setup(char *str)
+static int __init cad_setup(char *str)
- S390_lowcore.machine_flags &= ~MACHINE_FLAG_CAD;
+ int val;
+ get_option(&str, &val);
+ if (val && test_facility(128))
+ S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;
return 0;
-early_param("nocad", nocad_setup);
+early_param("cad", cad_setup);

static int __init cad_init(void)

Attachment: pgprT5yGUP5_l.pgp
Description: OpenPGP digital signature