mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6: UBIFS: fix assertion warning and refine comments UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS UBIFS: use GFP_NOFS properly UBI: use GFP_NOFS properly
This commit is contained in:
commit
fdc0ad80a4
7 changed files with 14 additions and 20 deletions
|
|
@ -1345,7 +1345,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
|
|||
if (!(ubi_chk_flags & UBI_CHK_IO))
|
||||
return 0;
|
||||
|
||||
buf1 = __vmalloc(len, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL);
|
||||
buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
|
||||
if (!buf1) {
|
||||
ubi_err("cannot allocate memory to check writes");
|
||||
return 0;
|
||||
|
|
@ -1409,7 +1409,7 @@ int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
|
|||
if (!(ubi_chk_flags & UBI_CHK_IO))
|
||||
return 0;
|
||||
|
||||
buf = __vmalloc(len, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL);
|
||||
buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
|
||||
if (!buf) {
|
||||
ubi_err("cannot allocate memory to check for 0xFFs");
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue