Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99764fa4 authored by WANG Cong's avatar WANG Cong Committed by Linus Torvalds
Browse files

UML: make several more things static 



- Make some variables and functions static, since they don't need to be
  global.

- Remove an unused function - arch/um/kernel/time.c::sched_clock().

- Clean the style a bit as complained by checkpatch.pl.

Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarWANG Cong <wangcong@zeuux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4a567582

arch/um/include/skas/skas.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ extern int user_thread(unsigned long stack, int flags); 
extern void new_thread_handler(void);

extern void handle_syscall(struct uml_pt_regs *regs);

extern int new_mm(unsigned long stack);

extern void get_skas_faultinfo(int pid, struct faultinfo * fi);

extern long execute_syscall_skas(void *r);

extern unsigned long current_stub_stack(void);

arch/um/include/um_uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ extern int copy_to_user(void __user *to, const void *from, int n); 


extern int __do_copy_to_user(void *to, const void *from, int n,

			     void **fault_addr, jmp_buf **fault_catcher);

extern void __do_copy(void *to, const void *from, int n);



/*

 * strncpy_from_user: - Copy a NUL terminated string from userspace.

arch/um/kernel/physmem.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ unsigned long find_iomem(char *driver, unsigned long *len_out) 
	return 0;

}



int setup_iomem(void)

static int setup_iomem(void)

{

	struct iomem_region *region = iomem_regions;

	unsigned long iomem_start = high_physmem + PAGE_SIZE;

arch/um/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	return ret;

}



void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs,

static void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs,

		  int error_code)

{

	struct siginfo info;

arch/um/kernel/time.c

+0 −8
Original line number Diff line number Diff line
@@ -13,14 +13,6 @@ 
#include "kern_util.h"

#include "os.h"



/*

 * Scheduler clock - returns current time in nanosec units.

 */

unsigned long long sched_clock(void)

{

	return (unsigned long long)jiffies_64 * (NSEC_PER_SEC / HZ);

}



void timer_handler(int sig, struct uml_pt_regs *regs)

{

	unsigned long flags;