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

Commit 8d91530c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Remove pointless printk from p4-clockmod.
  [CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c
  [CPUFREQ] Fix section mismatch for longhaul_cpu_init.
  [CPUFREQ] Fix section mismatch for longrun_cpu_init.
  [CPUFREQ] powernow-k8: Fix misleading variable naming
  [CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
  [CPUFREQ] arch/x86/kernel/cpu/cpufreq: use for_each_pci_dev()
  [CPUFREQ] fix brace coding style issue.
  [CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent
  [CPUFREQ] acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification
  [CPUFREQ] ondemand: don't synchronize sample rate unless multiple cpus present
  [CPUFREQ] unexport (un)lock_policy_rwsem* functions
  [CPUFREQ] ondemand: Refactor frequency increase code
  [CPUFREQ] powernow-k8: On load failure, remind the user to enable support in BIOS setup
  [CPUFREQ] powernow-k8: Limit Pstate transition latency check
  [CPUFREQ] Fix PCC driver error path
  [CPUFREQ] fix double freeing in error path of pcc-cpufreq
  [CPUFREQ] pcc driver should check for pcch method before calling _OSC
  [CPUFREQ] fix memory leak in cpufreq_add_dev
  [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"

Manually fix up non-data merge conflict introduced by new calling
conventions for trace_power_start() in commit 6f4f2723 ("x86
cpufreq: Make trace_power_frequency cpufreq driver independent"), which
didn't update the intel_idle native hardware cpuidle driver.
parents c145307a 9d1f44ee

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Diff line number Diff line
@@ -377,16 +377,6 @@ Who: Eric Paris <eparis@redhat.com> 


----------------------------



What:	lock_policy_rwsem_* and unlock_policy_rwsem_* will not be

	exported interface anymore.

When:	2.6.33

Why:	cpu_policy_rwsem has a new cleaner definition making it local to

	cpufreq core and contained inside cpufreq.c. Other dependent

	drivers should not use it in order to safely avoid lockdep issues.

Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>



----------------------------



What:	sound-slot/service-* module aliases and related clutters in

	sound/sound_core.c

When:	August 2010

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+2 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/compiler.h>

#include <linux/dmi.h>

#include <linux/slab.h>

#include <trace/events/power.h>



#include <linux/acpi.h>

#include <linux/io.h>
@@ -324,8 +323,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 
		}

	}



	trace_power_frequency(POWER_PSTATE, data->freq_table[next_state].frequency);



	switch (data->cpu_feature) {

	case SYSTEM_INTEL_MSR_CAPABLE:

		cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
@@ -351,7 +348,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 


	freqs.old = perf->states[perf->state].core_frequency * 1000;

	freqs.new = data->freq_table[next_state].frequency;

	for_each_cpu(i, cmd.mask) {

	for_each_cpu(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -367,7 +364,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 
		}

	}



	for_each_cpu(i, cmd.mask) {

	for_each_cpu(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}

arch/x86/kernel/cpu/cpufreq/gx-suspmod.c

+4 −7
Original line number Diff line number Diff line
@@ -169,12 +169,9 @@ static int gx_freq_mult[16] = { 
 *	Low Level chipset interface				*

 ****************************************************************/

static struct pci_device_id gx_chipset_tbl[] __initdata = {

	{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,

		PCI_ANY_ID, PCI_ANY_ID },

	{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520,

		PCI_ANY_ID, PCI_ANY_ID },

	{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510,

		PCI_ANY_ID, PCI_ANY_ID },

	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY), },

	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5520), },

	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5510), },

	{ 0, },

};
@@ -199,7 +196,7 @@ static __init struct pci_dev *gx_detect_chipset(void) 
	}



	/* detect which companion chip is used */

	while ((gx_pci = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, gx_pci)) != NULL) {

	for_each_pci_dev(gx_pci) {

		if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL)

			return gx_pci;

	}

arch/x86/kernel/cpu/cpufreq/longhaul.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/cpufreq/longhaul.h

+13 −13
Original line number Diff line number Diff line
@@ -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,