← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to arch/x86/kernel/apic/apic_flat_64.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kernel/apic/apic_flat_64.c
16
16
#include <linux/ctype.h>
17
17
#include <linux/init.h>
18
18
#include <linux/hardirq.h>
 
19
#include <linux/module.h>
19
20
#include <asm/smp.h>
20
21
#include <asm/apic.h>
21
22
#include <asm/ipi.h>
24
25
#include <acpi/acpi_bus.h>
25
26
#endif
26
27
 
 
28
static struct apic apic_physflat;
 
29
static struct apic apic_flat;
 
30
 
 
31
struct apic __read_mostly *apic = &apic_flat;
 
32
EXPORT_SYMBOL_GPL(apic);
 
33
 
27
34
static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
28
35
{
29
36
        return 1;
164
171
        return initial_apic_id >> index_msb;
165
172
}
166
173
 
167
 
struct apic apic_flat =  {
 
174
static struct apic apic_flat =  {
168
175
        .name                           = "flat",
169
176
        .probe                          = NULL,
170
177
        .acpi_madt_oem_check            = flat_acpi_madt_oem_check,
312
319
        return per_cpu(x86_cpu_to_apicid, cpu);
313
320
}
314
321
 
315
 
struct apic apic_physflat =  {
 
322
static int physflat_probe(void)
 
323
{
 
324
        if (apic == &apic_physflat || num_possible_cpus() > 8)
 
325
                return 1;
 
326
 
 
327
        return 0;
 
328
}
 
329
 
 
330
static struct apic apic_physflat =  {
316
331
 
317
332
        .name                           = "physical flat",
318
 
        .probe                          = NULL,
 
333
        .probe                          = physflat_probe,
319
334
        .acpi_madt_oem_check            = physflat_acpi_madt_oem_check,
320
335
        .apic_id_registered             = flat_apic_id_registered,
321
336
 
369
384
        .wait_icr_idle                  = native_apic_wait_icr_idle,
370
385
        .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
371
386
};
 
387
 
 
388
/*
 
389
 * We need to check for physflat first, so this order is important.
 
390
 */
 
391
apic_drivers(apic_physflat, apic_flat);