Subject: + firmware-dmi_scan-drop-oom-messages.patch added to -mm tree
To: jdelvare@xxxxxxx,joe@xxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 10 Jul 2013 14:34:44 -0700
The patch titled
Subject: firmware/dmi_scan: drop OOM messages
has been added to the -mm tree. Its filename is
firmware-dmi_scan-drop-oom-messages.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/firmware-dmi_scan-drop-oom-messages.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/firmware-dmi_scan-drop-oom-messages.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jean Delvare <jdelvare@xxxxxxx>
Subject: firmware/dmi_scan: drop OOM messages
As reported by Joe Perches: OOM messages generally aren't useful.
dmi_alloc is either a trivial front-end to kzalloc, and kzalloc already
does a dump_stack() when OOM, or for x86, dmi_alloc uses extend_brk which
BUGs when unsuccessful.
So we can remove all 6 such log messages in the dmi_scan driver, to shrink
the binary size (by 528 bytes on x86_64.)
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Reported-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/firmware/dmi_scan.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff -puN drivers/firmware/dmi_scan.c~firmware-dmi_scan-drop-oom-messages drivers/firmware/dmi_scan.c
--- a/drivers/firmware/dmi_scan.c~firmware-dmi_scan-drop-oom-messages
+++ a/drivers/firmware/dmi_scan.c
@@ -62,8 +62,6 @@ static const char * __init dmi_string(co
str = dmi_alloc(len);
if (str != NULL)
strcpy(str, bp);
- else
- pr_err("dmi_string: cannot allocate %Zu bytes.\n", len);
return str;
}
@@ -219,10 +217,8 @@ static void __init dmi_save_one_device(i
return;
dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
- if (!dev) {
- pr_err("dmi_save_one_device: out of memory.\n");
+ if (!dev)
return;
- }
dev->type = type;
strcpy((char *)(dev + 1), name);
@@ -258,10 +254,8 @@ static void __init dmi_save_oem_strings_
continue;
dev = dmi_alloc(sizeof(*dev));
- if (!dev) {
- pr_err("dmi_save_oem_strings_devices: out of memory.\n");
+ if (!dev)
break;
- }
dev->type = DMI_DEV_TYPE_OEM_STRING;
dev->name = devname;
@@ -277,18 +271,14 @@ static void __init dmi_save_ipmi_device(
void *data;
data = dmi_alloc(dm->length);
- if (data == NULL) {
- pr_err("dmi_save_ipmi_device: out of memory.\n");
+ if (data == NULL)
return;
- }
memcpy(data, dm, dm->length);
dev = dmi_alloc(sizeof(*dev));
- if (!dev) {
- pr_err("dmi_save_ipmi_device: out of memory.\n");
+ if (!dev)
return;
- }
dev->type = DMI_DEV_TYPE_IPMI;
dev->name = "IPMI controller";
@@ -303,10 +293,9 @@ static void __init dmi_save_dev_onboard(
struct dmi_dev_onboard *onboard_dev;
onboard_dev = dmi_alloc(sizeof(*onboard_dev) + strlen(name) + 1);
- if (!onboard_dev) {
- pr_err("dmi_save_dev_onboard: out of memory.\n");
+ if (!onboard_dev)
return;
- }
+
onboard_dev->instance = instance;
onboard_dev->segment = segment;
onboard_dev->bus = bus;
_
Patches currently in -mm which might be from jdelvare@xxxxxxx are
origin.patch
linux-next.patch
dmi_scan-add-comments-on-dmi_present-and-the-loop-in-dmi_scan_machine.patch
firmware-dmi_scan-drop-obsolete-comment.patch
firmware-dmi_scan-fix-most-checkpatch-errors-and-warnings.patch
firmware-dmi_scan-constify-strings.patch
firmware-dmi_scan-drop-oom-messages.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
