ia64: Sync up with 2.5.74+.

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9bfae790059dfa2097c6b0c01f361cd6ebd38f39..9c4f04e6363794b9f086024d700a6fd06ff5d9d8 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -708,33 +708,6 @@ config MAGIC_SYSRQ
          keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
          unless you really know what this hack does.
 
-config IA64_EARLY_PRINTK
-       bool "Early printk support"
-       depends on DEBUG_KERNEL && !IA64_GENERIC
-       help
-         Selecting this option uses the VGA screen or serial console for
-         printk() output before the consoles are initialised.  It is useful
-         for debugging problems early in the boot process, but only if you
-         have a suitable VGA/serial console attached.  If you're unsure,
-         select N.
-
-config IA64_EARLY_PRINTK_UART
-       bool "Early printk on MMIO serial port"
-       depends on IA64_EARLY_PRINTK
-
-config IA64_EARLY_PRINTK_UART_BASE
-       hex "UART MMIO base address"
-       depends on IA64_EARLY_PRINTK_UART
-       default "ff5e0000"
-
-config IA64_EARLY_PRINTK_VGA
-       bool "Early printk on VGA"
-       depends on IA64_EARLY_PRINTK
-
-config IA64_EARLY_PRINTK_SGI_SN
-       bool "Early printk on SGI SN serial console"
-       depends on IA64_EARLY_PRINTK && (IA64_GENERIC || IA64_SGI_SN2)
-
 config DEBUG_SLAB
        bool "Debug memory allocations"
        depends on DEBUG_KERNEL

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index ba2bcfc717b96e8f3eb55222a24950d3cbd7f972..8fe8f08641bcbb500aaa77fd9d9c0f5addb2cd51 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1408,7 +1408,7 @@ sys_call_table:
        data8 sys_sched_getaffinity
        data8 sys_set_tid_address
        data8 sys_fadvise64
-       data8 ia64_ni_syscall                   // 1235
+       data8 sys_tgkill                        // 1235
        data8 sys_exit_group
        data8 sys_lookup_dcookie
        data8 sys_io_setup

diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h
index 32ecc497b47395a45e6e1c90eb9dbd982e63beef..f3ea890b90e70e3c5c3032855d7acec0accab9f1 100644 (file)
--- a/arch/ia64/kernel/entry.h
+++ b/arch/ia64/kernel/entry.h
@@ -15,7 +15,6 @@
 
 #define PT_REGS_SAVES(off)                     \
        .unwabi 3, 'i';                         \
-       .unwabi @svr4, 'i';                     \
        .fframe IA64_PT_REGS_SIZE+16+(off);     \
        .spillsp rp, PT(CR_IIP)+16+(off);       \
        .spillsp ar.pfs, PT(CR_IFS)+16+(off);   \

diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index ff4f2b38f97772efe05c2e3e1da5253c362649ab..771ef25ab49e477b854127d74b131577a727fded 100644 (file)
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -655,8 +655,8 @@ fsyscall_table:
        data8 0                         // sched_setaffinity
        data8 0                         // sched_getaffinity
        data8 fsys_set_tid_address      // set_tid_address
-       data8 0                         // unused
-       data8 0                         // unused               // 1235
+       data8 0                         // fadvise64
+       data8 0                         // tgkill               // 1235
        data8 0                         // exit_group
        data8 0                         // lookup_dcookie
        data8 0                         // io_setup

diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 1c1bfb1f1fc9c5d223398c0aca2c5f3a83333b72..56e55b0a506186ed6871890fb0358a95260f0639 100644 (file)
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -317,7 +317,7 @@ struct task_struct;
 
 /*
  * Free all resources held by a thread. This is called after the
- * parent of DEAD_TASK has collected the exist status of the task via
+ * parent of DEAD_TASK has collected the exit status of the task via
  * wait().
  */
 #define release_thread(dead_task)

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 8a254dbd5e1c618755c4b0339b7d042f530e14a2..db02239d44b81b62dae58710e2e7f36653416490 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -224,7 +224,7 @@
 #define __NR_sched_getaffinity         1232
 #define __NR_set_tid_address           1233
 #define __NR_fadvise64                 1234
-/* 1235 available for reuse */
+#define __NR_tgkill                    1235
 #define __NR_exit_group                        1236
 #define __NR_lookup_dcookie            1237
 #define __NR_io_setup                  1238