aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-01 19:17:59 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-01 19:17:59 -0700
commite0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (patch)
tree3c5e9440c6a37c3355b50608836a23c8fa4eec99
parent16a789c11df5069576ef89f817348dbc6f3bd87e (diff)
parentd8caebd285a084ee1e4d484ce597865228614067 (diff)
downloadkernel_samsung_smdk4412-e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda.zip
kernel_samsung_smdk4412-e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda.tar.gz
kernel_samsung_smdk4412-e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda.tar.bz2
Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
-rw-r--r--arch/ia64/ia32/sys_ia32.c2
-rw-r--r--arch/ia64/kernel/mca.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 247a21c..c1e20d6 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -2427,7 +2427,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 __user * events, int maxevents,
{
struct epoll_event *events64 = NULL;
mm_segment_t old_fs = get_fs();
- int error, numevents, size;
+ int numevents, size;
int evt_idx;
int do_free_pages = 0;
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 2c75741..736e328 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1103,8 +1103,6 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
return IRQ_HANDLED;
}
-#endif /* CONFIG_ACPI */
-
/*
* ia64_mca_cpe_poll
*
@@ -1122,6 +1120,8 @@ ia64_mca_cpe_poll (unsigned long dummy)
platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
}
+#endif /* CONFIG_ACPI */
+
/*
* C portion of the OS INIT handler
*