Commit 83089c8f authored by Heiko Carstens's avatar Heiko Carstens
Browse files

Merge branch 'fixes' into features 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parents 6bddf115 7ab41c2c

arch/s390/boot/decompressor.c

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ void *decompress_kernel(void) 
	void *output = (void *)decompress_offset;



	__decompress(_compressed_start, _compressed_end - _compressed_start,

		     NULL, NULL, output, 0, NULL, error);

		     NULL, NULL, output, vmlinux.image_size, NULL, error);

	return output;

}

drivers/watchdog/diag288_wdt.c

+12 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int __diag288(unsigned int func, unsigned int timeout, 
		"1:\n"

		EX_TABLE(0b, 1b)

		: "+d" (err) : "d"(__func), "d"(__timeout),

		  "d"(__action), "d"(__len) : "1", "cc");

		  "d"(__action), "d"(__len) : "1", "cc", "memory");

	return err;

}
@@ -268,12 +268,21 @@ static int __init diag288_init(void) 
	char ebc_begin[] = {

		194, 197, 199, 201, 213

	};

	char *ebc_cmd;



	watchdog_set_nowayout(&wdt_dev, nowayout_info);



	if (MACHINE_IS_VM) {

		if (__diag288_vm(WDT_FUNC_INIT, 15,

				 ebc_begin, sizeof(ebc_begin)) != 0) {

		ebc_cmd = kmalloc(sizeof(ebc_begin), GFP_KERNEL);

		if (!ebc_cmd) {

			pr_err("The watchdog cannot be initialized\n");

			return -ENOMEM;

		}

		memcpy(ebc_cmd, ebc_begin, sizeof(ebc_begin));

		ret = __diag288_vm(WDT_FUNC_INIT, 15,

				   ebc_cmd, sizeof(ebc_begin));

		kfree(ebc_cmd);

		if (ret != 0) {

			pr_err("The watchdog cannot be initialized\n");

			return -EINVAL;

		}