tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e0d6d714 16a789c1

+3 -3
unified split
+1 -1
arch/ia64/ia32/sys_ia32.c
··· 2427 { 2428 struct epoll_event *events64 = NULL; 2429 mm_segment_t old_fs = get_fs(); 2430 - int error, numevents, size; 2431 int evt_idx; 2432 int do_free_pages = 0; 2433
··· 2427 { 2428 struct epoll_event *events64 = NULL; 2429 mm_segment_t old_fs = get_fs(); 2430 + int numevents, size; 2431 int evt_idx; 2432 int do_free_pages = 0; 2433
+2 -2
arch/ia64/kernel/mca.c
··· 1103 return IRQ_HANDLED; 1104 } 1105 1106 - #endif /* CONFIG_ACPI */ 1107 - 1108 /* 1109 * ia64_mca_cpe_poll 1110 * ··· 1119 /* Trigger a CPE interrupt cascade */ 1120 platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0); 1121 } 1122 1123 /* 1124 * C portion of the OS INIT handler
··· 1103 return IRQ_HANDLED; 1104 } 1105 1106 /* 1107 * ia64_mca_cpe_poll 1108 * ··· 1121 /* Trigger a CPE interrupt cascade */ 1122 platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0); 1123 } 1124 + 1125 + #endif /* CONFIG_ACPI */ 1126 1127 /* 1128 * C portion of the OS INIT handler