upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / arch / ppc64 / kernel / misc.S

diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index cbd3fe6..c682a0e 100644 (file)
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -115,12 +115,12 @@ _GLOBAL(call_do_softirq)
        mtlr    r0
        blr
 
-_GLOBAL(call_handle_irq_event)
+_GLOBAL(call_handle_IRQ_event)
        mflr    r0
        std     r0,16(r1)
        stdu    r1,THREAD_SIZE-112(r6)
        mr      r1,r6
-       bl      .handle_irq_event
+       bl      .handle_IRQ_event
        ld      r1,0(r1)
        ld      r0,16(r1)
        mtlr    r0
@@ -591,7 +591,7 @@ _GLOBAL(do_cpu_ftr_fixups)
        isync
        b       1b
 
-#ifdef CONFIG_PPC_PMAC
+#if defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE)
 /*
  * Do an IO access in real mode
  */
@@ -653,7 +653,7 @@ _GLOBAL(real_writeb)
        sync
        isync
        blr
-#endif /* CONFIG_PPC_PMAC */
+#endif /* defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE) */
 
 /*
  * Create a kernel thread
@@ -943,27 +943,27 @@ _GLOBAL(sys_call_table32)
        .llong .sys_epoll_wait
        .llong .sys_remap_file_pages
        .llong .ppc32_timer_create      /* 240 */
-       .llong .compat_timer_settime
-       .llong .compat_timer_gettime
+       .llong .compat_sys_timer_settime
+       .llong .compat_sys_timer_gettime
        .llong .sys_timer_getoverrun
        .llong .sys_timer_delete
-       .llong .compat_clock_settime    /* 245 */
-       .llong .compat_clock_gettime
-       .llong .compat_clock_getres
-       .llong .compat_clock_nanosleep
+       .llong .compat_sys_clock_settime        /* 245 */
+       .llong .compat_sys_clock_gettime
+       .llong .compat_sys_clock_getres
+       .llong .compat_sys_clock_nanosleep
        .llong .ppc32_swapcontext
        .llong .sys32_tgkill            /* 250 */
        .llong .sys32_utimes
-       .llong .compat_statfs64
-       .llong .compat_fstatfs64
+       .llong .compat_sys_statfs64
+       .llong .compat_sys_fstatfs64
        .llong .ppc32_fadvise64_64      /* 32bit only fadvise64_64 */
        .llong .ppc_rtas                /* 255 */
        .llong .sys_ni_syscall          /* 256 reserved for sys_debug_setcontext */
        .llong .sys_vserver
        .llong .sys_ni_syscall          /* 258 reserved for new sys_remap_file_pages */
-       .llong .compat_mbind
-       .llong .compat_get_mempolicy    /* 260 */
-       .llong .compat_set_mempolicy
+       .llong .compat_sys_mbind
+       .llong .compat_sys_get_mempolicy        /* 260 */
+       .llong .compat_sys_set_mempolicy
        .llong .compat_sys_mq_open
        .llong .sys_mq_unlink
        .llong .compat_sys_mq_timedsend
@@ -971,6 +971,9 @@ _GLOBAL(sys_call_table32)
        .llong .compat_sys_mq_notify
        .llong .compat_sys_mq_getsetattr
        .llong .sys_ni_syscall          /* 268 reserved for sys_kexec_load */
+       .llong .sys32_add_key
+       .llong .sys32_request_key
+       .llong .compat_sys_keyctl
 
        .balign 8
 _GLOBAL(sys_call_table)
@@ -1251,3 +1254,6 @@ _GLOBAL(sys_call_table)
        .llong .sys_mq_notify
        .llong .sys_mq_getsetattr
        .llong .sys_ni_syscall          /* 268 reserved for sys_kexec_load */
+       .llong .sys_add_key
+       .llong .sys_request_key         /* 270 */
+       .llong .sys_keyctl