diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-11 14:52:22 -0500 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-11 14:52:22 -0500 |
| commit | 9049a11de73d3ecc623f1903100d099f82ede56c (patch) | |
| tree | c03d130d58168e337a66fe999682452b7a02b42b /arch/x86/kernel/cpu/mcheck/mce_amd_64.c | |
| parent | c47c1b1f3a9d6973108020df1dcab7604f7774dd (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
Merge commit 'remotes/tip/x86/paravirt' into x86/untangle2
* commit 'remotes/tip/x86/paravirt': (175 commits)
xen: use direct ops on 64-bit
xen: make direct versions of irq_enable/disable/save/restore to common code
xen: setup percpu data pointers
xen: fix 32-bit build resulting from mmu move
x86/paravirt: return full 64-bit result
x86, percpu: fix kexec with vmlinux
x86/vmi: fix interrupt enable/disable/save/restore calling convention.
x86/paravirt: don't restore second return reg
xen: setup percpu data pointers
x86: split loading percpu segments from loading gdt
x86: pass in cpu number to switch_to_new_gdt()
x86: UV fix uv_flush_send_and_wait()
x86/paravirt: fix missing callee-save call on pud_val
x86/paravirt: use callee-saved convention for pte_val/make_pte/etc
x86/paravirt: implement PVOP_CALL macros for callee-save functions
x86/paravirt: add register-saving thunks to reduce caller register pressure
x86/paravirt: selectively save/restore regs around pvops calls
x86: fix paravirt clobber in entry_64.S
x86/pvops: add a paravirt_ident functions to allow special patching
xen: move remaining mmu-related stuff into mmu.c
...
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce_amd_64.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 8ae8c4ff094d..4772e91e8246 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | |||
| @@ -67,7 +67,7 @@ static struct threshold_block threshold_defaults = { | |||
| 67 | struct threshold_bank { | 67 | struct threshold_bank { |
| 68 | struct kobject *kobj; | 68 | struct kobject *kobj; |
| 69 | struct threshold_block *blocks; | 69 | struct threshold_block *blocks; |
| 70 | cpumask_t cpus; | 70 | cpumask_var_t cpus; |
| 71 | }; | 71 | }; |
| 72 | static DEFINE_PER_CPU(struct threshold_bank *, threshold_banks[NR_BANKS]); | 72 | static DEFINE_PER_CPU(struct threshold_bank *, threshold_banks[NR_BANKS]); |
| 73 | 73 | ||
| @@ -481,7 +481,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
| 481 | 481 | ||
| 482 | #ifdef CONFIG_SMP | 482 | #ifdef CONFIG_SMP |
| 483 | if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */ | 483 | if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */ |
| 484 | i = first_cpu(per_cpu(cpu_core_map, cpu)); | 484 | i = cpumask_first(&per_cpu(cpu_core_map, cpu)); |
| 485 | 485 | ||
| 486 | /* first core not up yet */ | 486 | /* first core not up yet */ |
| 487 | if (cpu_data(i).cpu_core_id) | 487 | if (cpu_data(i).cpu_core_id) |
| @@ -501,7 +501,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
| 501 | if (err) | 501 | if (err) |
| 502 | goto out; | 502 | goto out; |
| 503 | 503 | ||
| 504 | b->cpus = per_cpu(cpu_core_map, cpu); | 504 | cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu)); |
| 505 | per_cpu(threshold_banks, cpu)[bank] = b; | 505 | per_cpu(threshold_banks, cpu)[bank] = b; |
| 506 | goto out; | 506 | goto out; |
| 507 | } | 507 | } |
| @@ -512,15 +512,20 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
| 512 | err = -ENOMEM; | 512 | err = -ENOMEM; |
| 513 | goto out; | 513 | goto out; |
| 514 | } | 514 | } |
| 515 | if (!alloc_cpumask_var(&b->cpus, GFP_KERNEL)) { | ||
| 516 | kfree(b); | ||
| 517 | err = -ENOMEM; | ||
| 518 | goto out; | ||
| 519 | } | ||
| 515 | 520 | ||
| 516 | b->kobj = kobject_create_and_add(name, &per_cpu(device_mce, cpu).kobj); | 521 | b->kobj = kobject_create_and_add(name, &per_cpu(device_mce, cpu).kobj); |
| 517 | if (!b->kobj) | 522 | if (!b->kobj) |
| 518 | goto out_free; | 523 | goto out_free; |
| 519 | 524 | ||
| 520 | #ifndef CONFIG_SMP | 525 | #ifndef CONFIG_SMP |
| 521 | b->cpus = CPU_MASK_ALL; | 526 | cpumask_setall(b->cpus); |
| 522 | #else | 527 | #else |
| 523 | b->cpus = per_cpu(cpu_core_map, cpu); | 528 | cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu)); |
| 524 | #endif | 529 | #endif |
| 525 | 530 | ||
| 526 | per_cpu(threshold_banks, cpu)[bank] = b; | 531 | per_cpu(threshold_banks, cpu)[bank] = b; |
| @@ -529,7 +534,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
| 529 | if (err) | 534 | if (err) |
| 530 | goto out_free; | 535 | goto out_free; |
| 531 | 536 | ||
| 532 | for_each_cpu_mask_nr(i, b->cpus) { | 537 | for_each_cpu(i, b->cpus) { |
| 533 | if (i == cpu) | 538 | if (i == cpu) |
| 534 | continue; | 539 | continue; |
| 535 | 540 | ||
| @@ -545,6 +550,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) | |||
| 545 | 550 | ||
| 546 | out_free: | 551 | out_free: |
| 547 | per_cpu(threshold_banks, cpu)[bank] = NULL; | 552 | per_cpu(threshold_banks, cpu)[bank] = NULL; |
| 553 | free_cpumask_var(b->cpus); | ||
| 548 | kfree(b); | 554 | kfree(b); |
| 549 | out: | 555 | out: |
| 550 | return err; | 556 | return err; |
| @@ -619,7 +625,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) | |||
| 619 | #endif | 625 | #endif |
| 620 | 626 | ||
| 621 | /* remove all sibling symlinks before unregistering */ | 627 | /* remove all sibling symlinks before unregistering */ |
| 622 | for_each_cpu_mask_nr(i, b->cpus) { | 628 | for_each_cpu(i, b->cpus) { |
| 623 | if (i == cpu) | 629 | if (i == cpu) |
| 624 | continue; | 630 | continue; |
| 625 | 631 | ||
| @@ -632,6 +638,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) | |||
| 632 | free_out: | 638 | free_out: |
| 633 | kobject_del(b->kobj); | 639 | kobject_del(b->kobj); |
| 634 | kobject_put(b->kobj); | 640 | kobject_put(b->kobj); |
| 641 | free_cpumask_var(b->cpus); | ||
| 635 | kfree(b); | 642 | kfree(b); |
| 636 | per_cpu(threshold_banks, cpu)[bank] = NULL; | 643 | per_cpu(threshold_banks, cpu)[bank] = NULL; |
| 637 | } | 644 | } |