Skip to content

L
linux-davinci
Commit e0d6d714 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 16a789c1 d8caebd2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/ia64/ia32/sys_ia32.c
View file @ e0d6d714
...@@ -2427,7 +2427,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 __user * events, int maxevents, ...@@ -2427,7 +2427,7 @@ sys32_epoll_wait(int epfd, struct epoll_event32 __user * events, int maxevents,
{ {
struct epoll_event *events64 = NULL; struct epoll_event *events64 = NULL;
mm_segment_t old_fs = get_fs(); mm_segment_t old_fs = get_fs();
int error, numevents, size; int numevents, size;
int evt_idx; int evt_idx;
int do_free_pages = 0; int do_free_pages = 0;
......
arch/ia64/kernel/mca.c
View file @ e0d6d714
...@@ -1103,8 +1103,6 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs) ...@@ -1103,8 +1103,6 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#endif /* CONFIG_ACPI */
/* /*
* ia64_mca_cpe_poll * ia64_mca_cpe_poll
* *
...@@ -1122,6 +1120,8 @@ ia64_mca_cpe_poll (unsigned long dummy) ...@@ -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); 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 * C portion of the OS INIT handler
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment