ia64: Sync with 2.5.32 to get a working kernel.

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 27dd7a9649cdfc83d9c5fb4ff77b732d6b17d246..51bc5625b23eac1c8e4c01894787c9962efc83bd 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1229,11 +1229,11 @@ sys_call_table:
        data8 ia64_ni_syscall                   // 1235
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall
-       data8 ia64_ni_syscall
-       data8 ia64_ni_syscall
-       data8 ia64_ni_syscall                   // 1240
-       data8 ia64_ni_syscall
-       data8 ia64_ni_syscall
+       data8 sys_io_setup
+       data8 sys_io_destroy
+       data8 sys_io_getevents                  // 1240
+       data8 sys_io_submit
+       data8 sys_io_cancel
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall                   // 1245

diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 66a2f54c8cf2314888f908400828227864b26107..c0cd70dc76cf643ef6eefaf1d097afde1e9a3245 100644 (file)
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -135,8 +135,6 @@ ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
        siginfo_t siginfo;
        int sig, code;
 
-       die_if_kernel("bad break", regs, break_num);
-
        /* SIGILL, SIGFPE, SIGSEGV, and SIGBUS want these field initialized: */
        siginfo.si_addr = (void *) (regs->cr_iip + ia64_psr(regs)->ri);
        siginfo.si_imm = break_num;
@@ -144,7 +142,8 @@ ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
        siginfo.si_isr = 0;
 
        switch (break_num) {
-             case 0: /* unknown error */
+             case 0: /* unknown error (used by GCC for __builtin_abort()) */
+               die_if_kernel("bad break", regs, break_num);
                sig = SIGILL; code = ILL_ILLOPC;
                break;
 

diff --git a/include/asm-ia64/agp.h b/include/asm-ia64/agp.h
index 97dc1b9baed59f5ba9919324078c90453a1f0ccb..d91d0e3416ae9697a9cec728a27efa878b7c1ec9 100644 (file)
--- a/include/asm-ia64/agp.h
+++ b/include/asm-ia64/agp.h
@@ -18,4 +18,7 @@
 #define flush_agp_mappings()           /* nothing */
 #define flush_agp_cache()              mb()
 
+/* Page-protection value to be used for AGP memory mapped into kernel space.  */
+#define PAGE_AGP                       PAGE_KERNEL
+
 #endif /* _ASM_IA64_AGP_H */

diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 84c494e8a08380000ce862412919c8d921a0fa36..4f662595dd3e2ea00e1b758982a40884d2cdba50 100644 (file)
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -85,7 +85,7 @@ ide_init_default_hwifs (void)
        for(index = 0; index < MAX_HWIFS; index++) {
                ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
                hw.irq = ide_default_irq(ide_default_io_base(index));
-               ide_register_hw(&hw);
+               ide_register_hw(&hw, NULL);
        }
 #endif
 }

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index d996a75a13f13f9aad1050d587eedc7c5ac8eac9..761b073c638da809fffe625393168cad5f137fdb 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -223,10 +223,10 @@
 #define __NR_sched_setaffinity         1231
 #define __NR_sched_getaffinity         1232
 #define __NR_security                  1233
-#define __NR_get_large_pages           1234
-#define __NR_free_large_pages          1235
-#define __NR_share_large_pages         1236
-#define __NR_unshare_large_pages       1237
+#define __NR_alloc_hugepages           1234
+#define __NR_free_hugepages            1235
+/* 1236 currently unused */
+/* 1237 currently unused */
 #define __NR_io_setup                  1238
 #define __NR_io_destroy                        1239
 #define __NR_io_getevents              1240