diff options
| author |   Tony Luck <tony.luck@intel.com> | 2011-03-16 09:57:50 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-16 09:57:50 -0700 |
| commit | 4897313a62cf0b106e9e861bf7350a9cfc0715d0 (patch) | |
| tree | 0f43932bbc8aa2e0f96af2d1896f54d9de131a51 /arch/ia64/kernel | |
| parent | Linux 2.6.38 (diff) | |
| parent | [IA64] tioca: Fix assignment from incompatible pointer warnings (diff) | |
| download | linux-dev-4897313a62cf0b106e9e861bf7350a9cfc0715d0.tar.xz linux-dev-4897313a62cf0b106e9e861bf7350a9cfc0715d0.zip | |
Pull misc-2.6.39 into release branch
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/mca.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 1753f6a30d55..80d50b83d419 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -582,6 +582,8 @@ out: /* Get the CPE error record and log it */ ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE); + local_irq_disable(); + return IRQ_HANDLED; } @@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data) data = mca_bootmem(); first_time = 0; } else - data = __get_free_pages(GFP_KERNEL, get_order(sz)); + data = (void *)__get_free_pages(GFP_KERNEL, + get_order(sz)); if (!data) panic("Could not allocate MCA memory for cpu %d\n", cpu); |