Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / blackfin / kernel / entry.S

diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S
index 3f8769b..686478f 100644 (file)
--- a/arch/blackfin/kernel/entry.S
+++ b/arch/blackfin/kernel/entry.S
@@ -1,30 +1,7 @@
 /*
- * File:         arch/blackfin/kernel/entry.S
- * Based on:
- * Author:
+ * Copyright 2004-2009 Analog Devices Inc.
  *
- * Created:
- * Description:
- *
- * Modified:
- *               Copyright 2004-2006 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see the file COPYING, or write
- * to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Licensed under the GPL-2 or later
  */
 
 #include <linux/linkage.h>
@@ -67,7 +44,7 @@ ENTRY(_ret_from_fork)
        sti r4;
 #endif /* CONFIG_IPIPE */
        SP += -12;
-       call _schedule_tail;
+       pseudo_long_call _schedule_tail, p5;
        SP += 12;
        r0 = [sp + PT_IPEND];
        cc = bittst(r0,1);
@@ -102,7 +79,7 @@ ENTRY(_sys_vfork)
        r0 += 24;
        [--sp] = rets;
        SP += -12;
-       call _bfin_vfork;
+       pseudo_long_call _bfin_vfork, p2;
        SP += 12;
        rets = [sp++];
        rts;
@@ -113,7 +90,7 @@ ENTRY(_sys_clone)
        r0 += 24;
        [--sp] = rets;
        SP += -12;
-       call _bfin_clone;
+       pseudo_long_call _bfin_clone, p2;
        SP += 12;
        rets = [sp++];
        rts;
@@ -124,7 +101,7 @@ ENTRY(_sys_rt_sigreturn)
        r0 += 24;
        [--sp] = rets;
        SP += -12;
-       call _do_rt_sigreturn;
+       pseudo_long_call _do_rt_sigreturn, p2;
        SP += 12;
        rets = [sp++];
        rts;