score: fix function prototypes

Syscalls should return 'long' and be marked as 'asmlinkage'.
Functions that are only used in a single file should be 'static'.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2009-06-27 15:12:16 +02:00
parent a1f8213b95
commit bddc605955
3 changed files with 17 additions and 12 deletions

View file

@ -42,7 +42,7 @@ struct rt_sigframe {
struct ucontext rs_uc;
};
int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
static int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
{
int err = 0;
unsigned long reg;
@ -76,7 +76,7 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
return err;
}
int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
static int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
{
int err = 0;
u32 reg;
@ -118,8 +118,8 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
/*
* Determine which stack to use..
*/
void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
size_t frame_size)
static void __user *get_sigframe(struct k_sigaction *ka,
struct pt_regs *regs, size_t frame_size)
{
unsigned long sp;
@ -134,7 +134,8 @@ void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
return (void __user*)((sp - frame_size) & ~7);
}
int score_sigaltstack(struct pt_regs *regs)
asmlinkage long
score_sigaltstack(struct pt_regs *regs)
{
const stack_t __user *uss = (const stack_t __user *) regs->regs[4];
stack_t __user *uoss = (stack_t __user *) regs->regs[5];
@ -143,7 +144,8 @@ int score_sigaltstack(struct pt_regs *regs)
return do_sigaltstack(uss, uoss, usp);
}
void score_rt_sigreturn(struct pt_regs *regs)
asmlinkage long
score_rt_sigreturn(struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
sigset_t set;
@ -183,9 +185,11 @@ void score_rt_sigreturn(struct pt_regs *regs)
badframe:
force_sig(SIGSEGV, current);
return 0;
}
int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
static int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info)
{
struct rt_sigframe __user *frame;
@ -238,7 +242,7 @@ int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
return -EFAULT;
}
int handle_signal(unsigned long sig, siginfo_t *info,
static int handle_signal(unsigned long sig, siginfo_t *info,
struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
{
int ret;
@ -278,7 +282,7 @@ int handle_signal(unsigned long sig, siginfo_t *info,
return ret;
}
void do_signal(struct pt_regs *regs)
static void do_signal(struct pt_regs *regs)
{
struct k_sigaction ka;
sigset_t *oldset;

View file

@ -34,7 +34,7 @@
unsigned long shm_align_mask = PAGE_SIZE - 1;
EXPORT_SYMBOL(shm_align_mask);
asmlinkage unsigned long
asmlinkage unsigned
sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
unsigned long flags, unsigned long fd, unsigned long pgoff)
{
@ -66,7 +66,8 @@ sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
* Clone a task - this clones the calling program thread.
* This is called indirectly via a small wrapper
*/
int score_clone(struct pt_regs *regs)
asmlinkage long
score_clone(struct pt_regs *regs)
{
unsigned long clone_flags;
unsigned long newsp;

View file

@ -28,7 +28,7 @@
#include <asm/scoreregs.h>
irqreturn_t timer_interrupt(int irq, void *dev_id)
static irqreturn_t timer_interrupt(int irq, void *dev_id)
{
struct clock_event_device *evdev = dev_id;