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

Commit 36dfcea4 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

x86/gpu: Sprinkle const, __init and __initconst to stolen memory quirks 



gen8_stolen_size() is missing __init, so add it.

Also all the intel_stolen_funcs structures can be marked
__initconst.

intel_stolen_ids[] can also be made const if we replace the
__initdata with __initconst.

Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3e3b2c39

arch/x86/kernel/early-quirks.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -418,7 +418,7 @@ static size_t __init gen6_stolen_size(int num, int slot, int func) 
	return gmch_ctrl << 25; /* 32 MB units */

	return gmch_ctrl << 25; /* 32 MB units */

}

}





static size_t gen8_stolen_size(int num, int slot, int func)

static size_t __init gen8_stolen_size(int num, int slot, int func)

{

{

	u16 gmch_ctrl;

	u16 gmch_ctrl;
@@ -454,47 +454,47 @@ struct intel_stolen_funcs { 
	u32 (*base)(int num, int slot, int func, size_t size);

	u32 (*base)(int num, int slot, int func, size_t size);

};

};





static const struct intel_stolen_funcs i830_stolen_funcs = {

static const struct intel_stolen_funcs i830_stolen_funcs __initconst = {

	.base = i830_stolen_base,

	.base = i830_stolen_base,

	.size = i830_stolen_size,

	.size = i830_stolen_size,

};

};





static const struct intel_stolen_funcs i845_stolen_funcs = {

static const struct intel_stolen_funcs i845_stolen_funcs __initconst = {

	.base = i845_stolen_base,

	.base = i845_stolen_base,

	.size = i830_stolen_size,

	.size = i830_stolen_size,

};

};





static const struct intel_stolen_funcs i85x_stolen_funcs = {

static const struct intel_stolen_funcs i85x_stolen_funcs __initconst = {

	.base = i85x_stolen_base,

	.base = i85x_stolen_base,

	.size = gen3_stolen_size,

	.size = gen3_stolen_size,

};

};





static const struct intel_stolen_funcs i865_stolen_funcs = {

static const struct intel_stolen_funcs i865_stolen_funcs __initconst = {

	.base = i865_stolen_base,

	.base = i865_stolen_base,

	.size = gen3_stolen_size,

	.size = gen3_stolen_size,

};

};





static const struct intel_stolen_funcs gen3_stolen_funcs = {

static const struct intel_stolen_funcs gen3_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.base = intel_stolen_base,

	.size = gen3_stolen_size,

	.size = gen3_stolen_size,

};

};





static const struct intel_stolen_funcs gen6_stolen_funcs = {

static const struct intel_stolen_funcs gen6_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.base = intel_stolen_base,

	.size = gen6_stolen_size,

	.size = gen6_stolen_size,

};

};





static const struct intel_stolen_funcs gen8_stolen_funcs = {

static const struct intel_stolen_funcs gen8_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.base = intel_stolen_base,

	.size = gen8_stolen_size,

	.size = gen8_stolen_size,

};

};





static const struct intel_stolen_funcs chv_stolen_funcs = {

static const struct intel_stolen_funcs chv_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.base = intel_stolen_base,

	.size = chv_stolen_size,

	.size = chv_stolen_size,

};

};





static struct pci_device_id intel_stolen_ids[] __initdata = {

static const struct pci_device_id intel_stolen_ids[] __initconst = {

	INTEL_I830_IDS(&i830_stolen_funcs),

	INTEL_I830_IDS(&i830_stolen_funcs),

	INTEL_I845G_IDS(&i845_stolen_funcs),

	INTEL_I845G_IDS(&i845_stolen_funcs),

	INTEL_I85X_IDS(&i85x_stolen_funcs),

	INTEL_I85X_IDS(&i85x_stolen_funcs),