diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 13:13:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 13:13:58 -0700 |
| commit | 69b4a3a030df04e0b8961070fc33da6a5c0a19bb (patch) | |
| tree | 214ab5af5e6e630f4f39cb2dd05c9a346199612a /arch/s390/mm | |
| parent | 6160968cee8b90a5dd95318d716e31d7775c4ef3 (diff) | |
| parent | 0e003b709ef9f4c43f6338834526c3556ea71b19 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Enable LZ4 compression for the kernel image, add the machine id for
the new zBC12 model, fix an issue with hanging dasd devices, correct a
Kconfig dependency, fix a compile error in the perf module with
CONFIG_KVM=n and fix the find_next_bit_left primitive for the PCI base
layer"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dasd: fix hanging devices after path events
s390/perf: fix compile error (undefined reference sie_exit)
s390/bitops: fix find_next_bit_left
s390: add support for IBM zBC12 machine
s390/Kconfig: select 'TTY' when 'S390_GUEST' is enabled
s390: add support for LZ4-compressed kernel
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index ce36ea80e4f9..ad446b0c55b6 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -69,6 +69,7 @@ static void __init setup_zero_pages(void) order = 2; break; case 0x2827: /* zEC12 */ + case 0x2828: /* zEC12 */ default: order = 5; break; |