[CPUFREQ] Fix section mismatch for longhaul_cpu_init.
Use __cpuinit instead of __init for the cpufreq_driver init function like it is done in powernow-k8.c. Use the __cpuinitdata for data used by the routines marked as __cpuinit. This is removing the warning generated when compiling with the CONFIG_DEBUG_SECTION_MISMATCH=y option. Signed-off-by: Holger Hans Peter Freyther <holger@moiji-mobile.com> Signed-off-by: Dave Jones <davej@redhat.com>
This commit is contained in:
Родитель
7e2d811220
Коммит
2530573e45
|
@ -426,7 +426,7 @@ static int guess_fsb(int mult)
|
|||
}
|
||||
|
||||
|
||||
static int __init longhaul_get_ranges(void)
|
||||
static int __cpuinit longhaul_get_ranges(void)
|
||||
{
|
||||
unsigned int i, j, k = 0;
|
||||
unsigned int ratio;
|
||||
|
@ -530,7 +530,7 @@ static int __init longhaul_get_ranges(void)
|
|||
}
|
||||
|
||||
|
||||
static void __init longhaul_setup_voltagescaling(void)
|
||||
static void __cpuinit longhaul_setup_voltagescaling(void)
|
||||
{
|
||||
union msr_longhaul longhaul;
|
||||
struct mV_pos minvid, maxvid, vid;
|
||||
|
@ -784,7 +784,7 @@ static int longhaul_setup_southbridge(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
|
||||
static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
|
||||
{
|
||||
struct cpuinfo_x86 *c = &cpu_data(0);
|
||||
char *cpuname = NULL;
|
||||
|
|
|
@ -56,7 +56,7 @@ union msr_longhaul {
|
|||
/*
|
||||
* VIA C3 Samuel 1 & Samuel 2 (stepping 0)
|
||||
*/
|
||||
static const int __initdata samuel1_mults[16] = {
|
||||
static const int __cpuinitdata samuel1_mults[16] = {
|
||||
-1, /* 0000 -> RESERVED */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -75,7 +75,7 @@ static const int __initdata samuel1_mults[16] = {
|
|||
-1, /* 1111 -> RESERVED */
|
||||
};
|
||||
|
||||
static const int __initdata samuel1_eblcr[16] = {
|
||||
static const int __cpuinitdata samuel1_eblcr[16] = {
|
||||
50, /* 0000 -> RESERVED */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -97,7 +97,7 @@ static const int __initdata samuel1_eblcr[16] = {
|
|||
/*
|
||||
* VIA C3 Samuel2 Stepping 1->15
|
||||
*/
|
||||
static const int __initdata samuel2_eblcr[16] = {
|
||||
static const int __cpuinitdata samuel2_eblcr[16] = {
|
||||
50, /* 0000 -> 5.0x */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -119,7 +119,7 @@ static const int __initdata samuel2_eblcr[16] = {
|
|||
/*
|
||||
* VIA C3 Ezra
|
||||
*/
|
||||
static const int __initdata ezra_mults[16] = {
|
||||
static const int __cpuinitdata ezra_mults[16] = {
|
||||
100, /* 0000 -> 10.0x */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -138,7 +138,7 @@ static const int __initdata ezra_mults[16] = {
|
|||
120, /* 1111 -> 12.0x */
|
||||
};
|
||||
|
||||
static const int __initdata ezra_eblcr[16] = {
|
||||
static const int __cpuinitdata ezra_eblcr[16] = {
|
||||
50, /* 0000 -> 5.0x */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -160,7 +160,7 @@ static const int __initdata ezra_eblcr[16] = {
|
|||
/*
|
||||
* VIA C3 (Ezra-T) [C5M].
|
||||
*/
|
||||
static const int __initdata ezrat_mults[32] = {
|
||||
static const int __cpuinitdata ezrat_mults[32] = {
|
||||
100, /* 0000 -> 10.0x */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -196,7 +196,7 @@ static const int __initdata ezrat_mults[32] = {
|
|||
-1, /* 1111 -> RESERVED (12.0x) */
|
||||
};
|
||||
|
||||
static const int __initdata ezrat_eblcr[32] = {
|
||||
static const int __cpuinitdata ezrat_eblcr[32] = {
|
||||
50, /* 0000 -> 5.0x */
|
||||
30, /* 0001 -> 3.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -235,7 +235,7 @@ static const int __initdata ezrat_eblcr[32] = {
|
|||
/*
|
||||
* VIA C3 Nehemiah */
|
||||
|
||||
static const int __initdata nehemiah_mults[32] = {
|
||||
static const int __cpuinitdata nehemiah_mults[32] = {
|
||||
100, /* 0000 -> 10.0x */
|
||||
-1, /* 0001 -> 16.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -270,7 +270,7 @@ static const int __initdata nehemiah_mults[32] = {
|
|||
-1, /* 1111 -> 12.0x */
|
||||
};
|
||||
|
||||
static const int __initdata nehemiah_eblcr[32] = {
|
||||
static const int __cpuinitdata nehemiah_eblcr[32] = {
|
||||
50, /* 0000 -> 5.0x */
|
||||
160, /* 0001 -> 16.0x */
|
||||
40, /* 0010 -> 4.0x */
|
||||
|
@ -315,7 +315,7 @@ struct mV_pos {
|
|||
unsigned short pos;
|
||||
};
|
||||
|
||||
static const struct mV_pos __initdata vrm85_mV[32] = {
|
||||
static const struct mV_pos __cpuinitdata vrm85_mV[32] = {
|
||||
{1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
|
||||
{1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
|
||||
{1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
|
||||
|
@ -326,14 +326,14 @@ static const struct mV_pos __initdata vrm85_mV[32] = {
|
|||
{1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
|
||||
};
|
||||
|
||||
static const unsigned char __initdata mV_vrm85[32] = {
|
||||
static const unsigned char __cpuinitdata mV_vrm85[32] = {
|
||||
0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
|
||||
0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
|
||||
0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
|
||||
0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
|
||||
};
|
||||
|
||||
static const struct mV_pos __initdata mobilevrm_mV[32] = {
|
||||
static const struct mV_pos __cpuinitdata mobilevrm_mV[32] = {
|
||||
{1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
|
||||
{1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
|
||||
{1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
|
||||
|
@ -344,7 +344,7 @@ static const struct mV_pos __initdata mobilevrm_mV[32] = {
|
|||
{675, 3}, {650, 2}, {625, 1}, {600, 0}
|
||||
};
|
||||
|
||||
static const unsigned char __initdata mV_mobilevrm[32] = {
|
||||
static const unsigned char __cpuinitdata mV_mobilevrm[32] = {
|
||||
0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
|
||||
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
|
||||
0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
|
||||
|
|
Загрузка…
Ссылка в новой задаче