From: Chen Yu Date: Sun, 3 May 2015 14:35:05 +0000 (+0800) Subject: init: fix regression by supporting devices with major:minor:offset format X-Git-Tag: omap-for-v4.2/omap1-v2~17^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb31ef485dd4c6a205d1064b42027f82076d00c8;p=pandora-kernel.git init: fix regression by supporting devices with major:minor:offset format Commit 283e7ad02 ("init: stricter checking of major:minor root= values") was so strict that it exposed the fact that a previously unknown device format was being used. Distributions like Ubuntu uses klibc (rather than uswsusp) to resume system from hibernation. klibc expressed the swap partition/file in the form of major:minor:offset. For example, 8:3:0 represents a swap partition in klibc, and klibc's resume process in initrd will finally echo 8:3:0 to /sys/power/resume for manually resuming. However, due to commit 283e7ad02's stricter checking, 8:3:0 will be treated as an invalid device format, and manual resuming from hibernation will fail. Fix this by adding support for devices with major:minor:offset format when resuming from hibernation. Reported-by: Prigent, Christophe Signed-off-by: Chen Yu Acked-by: Rafael J. Wysocki Signed-off-by: Mike Snitzer --- Reading git-diff-tree failed