Skip to contentSkip to conversation

introduce __cpuinitconst

PATCH In review Jan Beulich 2 participants 3 messages Jan 11, 2008 – Jan 14, 2008 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 introduce __cpuinitconst

The patch doesn't change all instances where 'const' could have been added as a result of the base structure changes, only where the change has a real effect (the module loader doesn't enforce read-only section attributes at present, so only built-in files make a real difference).

---
 drivers/acpi/processor_idle.c |    2 +-
 include/linux/init.h          |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/processor_idle.c +1 -1
@@ -118,7 +118,7 @@ static int set_max_cstate(const struct d
 
 /* Actually this shouldn't be __cpuinitdata, would be better to fix the
    callers to only run once -AK */
-static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
+static struct dmi_system_id __cpuinitconst processor_power_dmi_table[] = {
 	{ set_max_cstate, "IBM ThinkPad R40e", {
 	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
 	  DMI_MATCH(DMI_BIOS_VERSION,"1SET70WW")}, (void *)1},
include/linux/init.h +2 -0
@@ -269,11 +269,13 @@ void __init parse_early_param(void);
 #ifdef CONFIG_HOTPLUG_CPU
 #define __cpuinit
 #define __cpuinitdata
+#define __cpuinitconst const
 #define __cpuexit
 #define __cpuexitdata
 #else
 #define __cpuinit	__init
 #define __cpuinitdata __initdata
+#define __cpuinitconst __initdata
 #define __cpuexit __exit
 #define __cpuexitdata	__exitdata
 #endif
#1 lore raw
Quoted 31 lines · Jan Beulich

The patch doesn't change all instances where 'const' could have been added as a result of the base structure changes, only where the change has a real effect (the module loader doesn't enforce read-only section attributes at present, so only built-in files make a real difference).

---
 drivers/acpi/processor_idle.c |    2 +-
 include/linux/init.h          |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/processor_idle.c +1 -1
@@ -118,7 +118,7 @@ static int set_max_cstate(const struct d
 
 /* Actually this shouldn't be __cpuinitdata, would be better to fix the
    callers to only run once -AK */
-static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
+static struct dmi_system_id __cpuinitconst processor_power_dmi_table[] = {
 	{ set_max_cstate, "IBM ThinkPad R40e", {
 	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
 	  DMI_MATCH(DMI_BIOS_VERSION,"1SET70WW")}, (void *)1},
include/linux/init.h +0 -0
@@ -269,11 +269,13 @@ void __init parse_early_param(void);
 #ifdef CONFIG_HOTPLUG_CPU
 #define __cpuinit
 #define __cpuinitdata

include/linux/init.h void __init parse_early_param(void); · line 281

Quoted 10 lines
include/linux/init.h +2 -0
+#define __cpuinitconst const
 #define __cpuexit
 #define __cpuexitdata
 #else
 #define __cpuinit	__init
 #define __cpuinitdata __initdata
+#define __cpuinitconst __initdata
 #define __cpuexit __exit
 #define __cpuexitdata	__exitdata
 #endif

__cpuinitconstdata ?

I know it's a bit long, but it would be more logically when looking at the other ones.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw
Quoted 19 lines
Quoted 6 lines
include/linux/init.h +0 -0
@@ -269,11 +269,13 @@ void __init parse_early_param(void);
 #ifdef CONFIG_HOTPLUG_CPU
 #define __cpuinit
 #define __cpuinitdata

include/linux/init.h void __init parse_early_param(void); · line 281

Quoted 10 lines
include/linux/init.h +2 -0
+#define __cpuinitconst const
 #define __cpuexit
 #define __cpuexitdata
 #else
 #define __cpuinit	__init
 #define __cpuinitdata __initdata
+#define __cpuinitconst __initdata
 #define __cpuexit __exit
 #define __cpuexitdata	__exitdata
 #endif

__cpuinitconstdata ?

Quoted 2 lines

I know it's a bit long, but it would be more logically when looking at the other ones.

I considered it, but didn't use it because as you say it's a bit long and additionally nothing but data can be 'const'.

Jan