Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33fd7afd authored by Len Brown's avatar Len Brown
Browse files

pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..." 

We have been printing these messages at KERN_ERR since 2.6.24,
per http://bugzilla.kernel.org/show_bug.cgi?id=9535

But KERN_ERR pops up on a console booted with "quiet"
and causes users to get alarmed and file bugs
about the message itself:
https://bugzilla.redhat.com/show_bug.cgi?id=436589



So reduce the severity of these messages to
KERN_WARNING, which is not printed by "quiet".

This message will still be seen without "quiet",
but a lot of messages are printed in that mode
and it will be less likely to cause undue alarm.

We could go all the way to KERN_DEBUG, but this
is a real warning after all, so it seems prudent
not to require "debug" to see it.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 05dda977

drivers/pnp/pnpacpi/rsparser.c

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, 
	       i < PNP_MAX_IRQ)

		i++;

	if (i >= PNP_MAX_IRQ && !warned) {

		printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "

		printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ "

				"resources: %d \n", PNP_MAX_IRQ);

		warned = 1;

		return;
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, 
		res->dma_resource[i].start = dma;

		res->dma_resource[i].end = dma;

	} else if (!warned) {

		printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "

		printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "

				"resources: %d \n", PNP_MAX_DMA);

		warned = 1;

	}
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res, 
		res->port_resource[i].start = io;

		res->port_resource[i].end = io + len - 1;

	} else if (!warned) {

		printk(KERN_ERR "pnpacpi: exceeded the max number of IO "

		printk(KERN_WARNING "pnpacpi: exceeded the max number of IO "

				"resources: %d \n", PNP_MAX_PORT);

		warned = 1;

	}
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res, 
		res->mem_resource[i].start = mem;

		res->mem_resource[i].end = mem + len - 1;

	} else if (!warned) {

		printk(KERN_ERR "pnpacpi: exceeded the max number of mem "

		printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "

				"resources: %d\n", PNP_MAX_MEM);

		warned = 1;

	}