← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/powerpc/kernel/cputable.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/kernel/cputable.c
14
14
#include <linux/sched.h>
15
15
#include <linux/threads.h>
16
16
#include <linux/init.h>
17
 
#include <linux/module.h>
 
17
#include <linux/export.h>
18
18
 
19
19
#include <asm/oprofile_impl.h>
20
20
#include <asm/cputable.h>
2051
2051
 
2052
2052
static struct cpu_spec the_cpu_spec;
2053
2053
 
2054
 
static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
 
2054
static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,
 
2055
                                               struct cpu_spec *s)
2055
2056
{
2056
2057
        struct cpu_spec *t = &the_cpu_spec;
2057
2058
        struct cpu_spec old;
2114
2115
                t->cpu_setup(offset, t);
2115
2116
        }
2116
2117
#endif /* CONFIG_PPC64 || CONFIG_BOOKE */
 
2118
 
 
2119
        return t;
2117
2120
}
2118
2121
 
2119
2122
struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
2124
2127
        s = PTRRELOC(s);
2125
2128
 
2126
2129
        for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) {
2127
 
                if ((pvr & s->pvr_mask) == s->pvr_value) {
2128
 
                        setup_cpu_spec(offset, s);
2129
 
                        return s;
2130
 
                }
 
2130
                if ((pvr & s->pvr_mask) == s->pvr_value)
 
2131
                        return setup_cpu_spec(offset, s);
2131
2132
        }
2132
2133
 
2133
2134
        BUG();