linux-kernel - linux-next: manual merge of the pm tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140501120932.ff26772f983a436b4453c915@canb.auug.org.au>
Date:	Thu, 1 May 2014 12:09:32 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Aaro Koskinen <aaro.koskinen@....fi>,
	Stratos Karafotis <stratosk@...aphore.gr>
Subject: linux-next: manual merge of the pm tree with the mips tree

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45
("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree
and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry
macro for iteration") from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/loongson/lemote-2f/clock.c
index 67dd94ef28e6,1eed38e28b1e..000000000000
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@@ -91,10 -91,9 +91,10 @@@ EXPORT_SYMBOL(clk_put)
  
  int clk_set_rate(struct clk *clk, unsigned long rate)
  {
 +	unsigned int rate_khz = rate / 1000;
+ 	struct cpufreq_frequency_table *pos;
  	int ret = 0;
  	int regval;
- 	int i;
  
  	if (likely(clk->ops && clk->ops->set_rate)) {
  		unsigned long flags;
@@@ -107,15 -106,10 +107,10 @@@
  	if (unlikely(clk->flags & CLK_RATE_PROPAGATES))
  		propagate_rate(clk);
  
- 	for (i = 0; loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END;
- 	     i++) {
- 		if (loongson2_clockmod_table[i].frequency ==
- 		    CPUFREQ_ENTRY_INVALID)
- 			continue;
- 		if (rate_khz == loongson2_clockmod_table[i].frequency)
+ 	cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table)
 -		if (rate == pos->frequency)
++		if (rate_khz == pos->frequency)
  			break;
- 	}
- 	if (rate_khz != loongson2_clockmod_table[i].frequency)
 -	if (rate != pos->frequency)
++	if (rate_khz != pos->frequency)
  		return -ENOTSUPP;
  
  	clk->rate = rate;

Content of type "application/pgp-signature" skipped