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

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

uml: style fixes in arch/um/kernel 



Joe Perches noticed some printks in smp.c that needed fixing.

While I was in there, I did the usual tidying in arch/um/kernel, which
should be fairly style-clean at this point:
	copyright updates
	emacs formatting comments removal
	include tidying
	style fixes

Cc: Joe Perches <joe@perches.com>
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 e6a2d1f7

arch/um/kernel/exitcode.c

+17 −14
Original line number 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

 */



#include "linux/kernel.h"

#include "linux/init.h"

#include "linux/ctype.h"

#include "linux/proc_fs.h"

#include "asm/uaccess.h"

#include <linux/ctype.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/proc_fs.h>

#include <linux/types.h>

#include <asm/uaccess.h>



/* If read and write race, the read will still atomically read a valid

/*

 * If read and write race, the read will still atomically read a valid

 * value.

 */

int uml_exitcode = 0;
@@ -19,7 +21,8 @@ static int read_proc_exitcode(char *page, char **start, off_t off, 
{

	int len, val;



	/* Save uml_exitcode in a local so that we don't need to guarantee

	/*

	 * Save uml_exitcode in a local so that we don't need to guarantee

	 * that sprintf accesses it atomically.

	 */

	val = uml_exitcode;

arch/um/kernel/gmon_syms.c

+6 −5
Original line number 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

 */
@@ -8,12 +8,13 @@ 
extern void __bb_init_func(void *)  __attribute__((weak));

EXPORT_SYMBOL(__bb_init_func);



/* This is defined (and referred to in profiling stub code) only by some GCC

/*

 * This is defined (and referred to in profiling stub code) only by some GCC

 * versions in libgcov.

 *

 * Since SuSE backported the fix, we cannot handle it depending on GCC version.

 * So, unconditionally export it. But also give it a weak declaration, which will

 * be overridden by any other one.

 * So, unconditionally export it. But also give it a weak declaration, which

 * will be overridden by any other one.

 */



extern void __gcov_init(void *) __attribute__((weak));

arch/um/kernel/gprof_syms.c

+1 −12
Original line number 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

 */
@@ -7,14 +7,3 @@ 


extern void mcount(void);

EXPORT_SYMBOL(mcount);
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */

arch/um/kernel/process.c

+22 −19
Original line number Diff line number Diff line
@@ -4,19 +4,21 @@ 
 * Licensed under the GPL

 */



#include "linux/stddef.h"

#include "linux/err.h"

#include "linux/hardirq.h"

#include "linux/mm.h"

#include "linux/personality.h"

#include "linux/proc_fs.h"

#include "linux/ptrace.h"

#include "linux/random.h"

#include "linux/sched.h"

#include "linux/tick.h"

#include "linux/threads.h"

#include "asm/pgtable.h"

#include "asm/uaccess.h"

#include <linux/stddef.h>

#include <linux/err.h>

#include <linux/hardirq.h>

#include <linux/gfp.h>

#include <linux/mm.h>

#include <linux/personality.h>

#include <linux/proc_fs.h>

#include <linux/ptrace.h>

#include <linux/random.h>

#include <linux/sched.h>

#include <linux/tick.h>

#include <linux/threads.h>

#include <asm/current.h>

#include <asm/pgtable.h>

#include <asm/uaccess.h>

#include "as-layout.h"

#include "kern_util.h"

#include "os.h"
@@ -94,14 +96,15 @@ void *_switch_to(void *prev, void *next, void *last) 
	do {

		current->thread.saved_task = NULL;



		switch_threads(&from->thread.switch_buf, &to->thread.switch_buf);

		switch_threads(&from->thread.switch_buf,

			       &to->thread.switch_buf);



		arch_switch_to(current);



		if (current->thread.saved_task)

			show_regs(&(current->thread.regs));

		next = current->thread.saved_task;

		prev = current;

		to = current->thread.saved_task;

		from = current;

	} while (current->thread.saved_task);



	return current->thread.prev_sched;

arch/um/kernel/sigio.c

+6 −12
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)

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

 * Licensed under the GPL

 */



#include "linux/kernel.h"

#include "linux/list.h"

#include "linux/slab.h"

#include "linux/signal.h"

#include "linux/interrupt.h"

#include "init.h"

#include "sigio.h"

#include "irq_user.h"

#include <linux/interrupt.h>

#include "irq_kern.h"

#include "os.h"

#include "sigio.h"



/* Protected by sigio_lock() called from write_sigio_workaround */

static int sigio_irq_fd = -1;
@@ -34,8 +28,8 @@ int write_sigio_irq(int fd) 
			     IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio",

			     NULL);

	if (err) {

		printk("write_sigio_irq : um_request_irq failed, err = %d\n",

		       err);

		printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "

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

		return -1;

	}

	sigio_irq_fd = fd;