kernel: fix some compile warnings with kernel 3.14

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 40734
2014-05-08 21:52:40 +00:00
parent 100e795bcc
commit ff12bcef16
2 changed files with 7 additions and 3 deletions
--- a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
@@ -6,7 +6,7 @@
 		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
 +	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
 +	if (p != NULL && l > 0)
-+		strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE));
+		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
 
 	/*
 	 * CONFIG_CMDLINE is meant to be a default in case nothing else