diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-05-01 11:02:34 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-05-01 11:02:34 -0700 |
| commit | b3859ee18ed287170b66b19a78191f7312ec3470 (patch) | |
| tree | c52550132fdf6802b159531498bde8dcfbd26180 /lib | |
| parent | Merge tag 'v4.17-rc2' into next-general (diff) | |
| parent | Linux v4.17-rc3 (diff) | |
| download | linux-dev-b3859ee18ed287170b66b19a78191f7312ec3470.tar.xz linux-dev-b3859ee18ed287170b66b19a78191f7312ec3470.zip | |
Merge tag 'v4.17-rc3' into next-general
Merge to Linux v4.17-rc3 which has stability bugfix.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dma-direct.c | 3 | ||||
| -rw-r--r-- | lib/kobject.c | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/dma-direct.c b/lib/dma-direct.c index c0bba30fef0a..bbfb229aa067 100644 --- a/lib/dma-direct.c +++ b/lib/dma-direct.c @@ -84,7 +84,8 @@ again: __free_pages(page, page_order); page = NULL; - if (dev->coherent_dma_mask < DMA_BIT_MASK(32) && + if (IS_ENABLED(CONFIG_ZONE_DMA) && + dev->coherent_dma_mask < DMA_BIT_MASK(32) && !(gfp & GFP_DMA)) { gfp = (gfp & ~GFP_DMA32) | GFP_DMA; goto again; diff --git a/lib/kobject.c b/lib/kobject.c index e1d1f290bf35..18989b5b3b56 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -233,13 +233,12 @@ static int kobject_add_internal(struct kobject *kobj) /* be noisy on error issues */ if (error == -EEXIST) - WARN(1, - "%s failed for %s with -EEXIST, don't try to register things with the same name in the same directory.\n", - __func__, kobject_name(kobj)); + pr_err("%s failed for %s with -EEXIST, don't try to register things with the same name in the same directory.\n", + __func__, kobject_name(kobj)); else - WARN(1, "%s failed for %s (error: %d parent: %s)\n", - __func__, kobject_name(kobj), error, - parent ? kobject_name(parent) : "'none'"); + pr_err("%s failed for %s (error: %d parent: %s)\n", + __func__, kobject_name(kobj), error, + parent ? kobject_name(parent) : "'none'"); } else kobj->state_in_sysfs = 1; |