Messages in this thread Patch in this message | | | From | Uwe Kleine-König <> | Subject | [PATCH 16/17] drivers/x86: mark const init data with __initconst instead of __initdata | Date | Thu, 29 Mar 2012 23:12:33 +0200 |
| |
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 <u.kleine-koenig@pengutronix.de> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> Cc: platform-driver-x86@vger.kernel.org Cc: ibm-acpi-devel@lists.sourceforge.net --- drivers/platform/x86/dell-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index a05fc9c..882bfa4 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 = { diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index d68c000..dc1900c 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -522,7 +522,7 @@ static acpi_handle ec_handle; #define TPACPI_HANDLE(object, parent, paths...) \ static acpi_handle object##_handle; \ - static const acpi_handle *object##_parent __initdata = \ + static const acpi_handle *object##_parent __initconst = \ &parent##_handle; \ static char *object##_paths[] __initdata = { paths } -- 1.7.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |