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

Commit ba180fd4 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: style fixes pass 3 



Formatting changes in the files which have been changed in the course
of folding foo_skas functions into their callers.  These include:
	copyright updates
	header file trimming
	style fixes
	adding severity to printks

These changes should be entirely non-functional.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77bf4400

arch/um/include/irq_user.h

+2 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 * Licensed under the GPL

 */

 */





#ifndef __IRQ_USER_H__

#ifndef __IRQ_USER_H__

#define __IRQ_USER_H__

#define __IRQ_USER_H__





#include "uml-config.h"

#include "sysdep/ptrace.h"





struct irq_fd {

struct irq_fd {

	struct irq_fd *next;

	struct irq_fd *next;

arch/um/include/kern_util.h

+1 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 * Licensed under the GPL

 */

 */
@@ -8,7 +8,6 @@ 




#include "sysdep/ptrace.h"

#include "sysdep/ptrace.h"

#include "sysdep/faultinfo.h"

#include "sysdep/faultinfo.h"

#include "uml-config.h"





typedef void (*kern_hndl)(int, struct uml_pt_regs *);

typedef void (*kern_hndl)(int, struct uml_pt_regs *);

arch/um/include/os.h

+7 −9
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 * Licensed under the GPL

 */

 */





#ifndef __OS_H__

#ifndef __OS_H__

#define __OS_H__

#define __OS_H__





#include "uml-config.h"

#include <stdarg.h>

#include "asm/types.h"

#include "../os/include/file.h"

#include "sysdep/ptrace.h"

#include "kern_util.h"

#include "skas/mm_id.h"

#include "irq_user.h"

#include "irq_user.h"

#include "kern_util.h"

#include "longjmp.h"

#include "mm_id.h"

#include "sysdep/tls.h"

#include "sysdep/tls.h"

#include "sysdep/archsetjmp.h"

#include "../os/include/file.h"





#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))

#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
@@ -140,7 +138,7 @@ extern int os_set_slip(int fd); 
extern int os_set_owner(int fd, int pid);

extern int os_set_owner(int fd, int pid);

extern int os_mode_fd(int fd, int mode);

extern int os_mode_fd(int fd, int mode);





extern int os_seek_file(int fd, __u64 offset);

extern int os_seek_file(int fd, unsigned long long offset);

extern int os_open_file(char *file, struct openflags flags, int mode);

extern int os_open_file(char *file, struct openflags flags, int mode);

extern int os_read_file(int fd, void *buf, int len);

extern int os_read_file(int fd, void *buf, int len);

extern int os_write_file(int fd, const void *buf, int count);

extern int os_write_file(int fd, const void *buf, int count);

arch/um/include/skas/skas.h

+1 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 * Licensed under the GPL

 */

 */





#ifndef __SKAS_H

#ifndef __SKAS_H

#define __SKAS_H

#define __SKAS_H





#include "mm_id.h"

#include "sysdep/ptrace.h"

#include "sysdep/ptrace.h"





extern int userspace_pid[];

extern int userspace_pid[];

arch/um/kernel/exec.c

+18 −23
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 * Licensed under the GPL

 */

 */





#include "linux/slab.h"

#include "linux/stddef.h"

#include "linux/fs.h"

#include "linux/smp_lock.h"

#include "linux/smp_lock.h"

#include "linux/ptrace.h"

#include "linux/ptrace.h"

#include "linux/fs.h"

#include "linux/sched.h"

#include "asm/ptrace.h"

#include "asm/current.h"

#include "asm/pgtable.h"

#include "asm/processor.h"

#include "asm/tlbflush.h"

#include "asm/uaccess.h"

#include "asm/uaccess.h"

#include "kern_util.h"

#include "as-layout.h"

#include "mem_user.h"

#include "mem_user.h"

#include "kern.h"

#include "skas.h"

#include "irq_user.h"

#include "tlb.h"

#include "os.h"

#include "os.h"

#include "skas/skas.h"





void flush_thread(void)

void flush_thread(void)

{

{
@@ -30,7 +25,7 @@ void flush_thread(void) 




	ret = unmap(&current->mm->context.skas.id, 0, end, 1, &data);

	ret = unmap(&current->mm->context.skas.id, 0, end, 1, &data);

	if (ret) {

	if (ret) {

		printk("flush_thread - clearing address space failed, "

		printk(KERN_ERR "flush_thread - clearing address space failed, "

		       "err = %d\n", ret);

		       "err = %d\n", ret);

		force_sig(SIGKILL, current);

		force_sig(SIGKILL, current);

	}

	}
@@ -71,7 +66,7 @@ static long execve1(char *file, char __user * __user *argv, 
#endif

#endif

		task_unlock(current);

		task_unlock(current);

	}

	}

        return(error);

	return error;

}

}





long um_execve(char *file, char __user *__user *argv, char __user *__user *env)

long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
@@ -81,7 +76,7 @@ long um_execve(char *file, char __user *__user *argv, char __user *__user *env) 
	err = execve1(file, argv, env);

	err = execve1(file, argv, env);

	if (!err)

	if (!err)

		do_longjmp(current->thread.exec_buf, 1);

		do_longjmp(current->thread.exec_buf, 1);

	return(err);

	return err;

}

}





long sys_execve(char __user *file, char __user *__user *argv,

long sys_execve(char __user *file, char __user *__user *argv,
@@ -98,5 +93,5 @@ long sys_execve(char __user *file, char __user *__user *argv, 
	putname(filename);

	putname(filename);

 out:

 out:

	unlock_kernel();

	unlock_kernel();

	return(error);

	return error;

}
 
}