linux-next: manual merge of the cpuinit tree with the hwmon-staging tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the cpuinit tree got a conflict in
drivers/hwmon/coretemp.c between commit cc58db361386 ("hwmon: (coretemp)
Atom CPUs don't support TjMax; no warning needed") from the hwmon-staging
tree and commit "hwmon: delete __cpuinit usage from all hwmon files" from
the cpuinit tree.

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

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/hwmon/coretemp.c
index be58da1,2e5e2dc..0000000
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@@ -317,20 -316,7 +316,19 @@@ static int adjust_tjmax(struct cpuinfo_
        return tjmax;
  }
  
 +static bool cpu_has_tjmax(struct cpuinfo_x86 *c)
 +{
 +      u8 model = c->x86_model;
 +
 +      return model > 0xe &&
 +             model != 0x1c &&
 +             model != 0x26 &&
 +             model != 0x27 &&
 +             model != 0x35 &&
 +             model != 0x36;
 +}
 +
- static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
-                              struct device *dev)
+ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
  {
        int err;
        u32 eax, edx;

pgpgk7SK7gqep.pgp
Description: PGP signature