From: Uwe Kleine-König Date: Fri, 30 Mar 2012 20:05:04 +0000 (+0200) Subject: drivers/x86: mark const init data with __initconst instead of __initdata X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=145047de994098dcc1a342af6444b2a7d64c4075;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git drivers/x86: mark const init data with __initconst instead of __initdata As long as there is no other non-const variable marked __initdata in the same compilation unit it doesn't hurt. If there were one however compilation would fail with error: $variablename causes a section type conflict because a section containing const variables is marked read only and so cannot contain non-const variables. Signed-off-by: Uwe Kleine-König Cc: Matthew Garrett Cc: Henrique de Moraes Holschuh Cc: platform-driver-x86@vger.kernel.org Cc: ibm-acpi-devel@lists.sourceforge.net Signed-off-by: Matthew Garrett --- diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index a269e1abe50d..255040bc89c0 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -94,7 +94,7 @@ static struct rfkill *wifi_rfkill; static struct rfkill *bluetooth_rfkill; static struct rfkill *wwan_rfkill; -static const struct dmi_system_id __initdata dell_device_table[] = { +static const struct dmi_system_id dell_device_table[] __initconst = { { .ident = "Dell laptop", .matches = {