mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
uml: style fixes pass 1
Formatting changes in the files which have been changed in the tt-removal patchset so far. These include: copyright updates header file trimming style fixes adding severity to printks indenting Kconfig help according to the predominant kernel style These changes should be entirely non-functional. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike
Linus Torvalds
parent
c28b59d477
commit
4c9e138513
15 changed files with 278 additions and 309 deletions
|
|
@ -161,7 +161,7 @@ config MCONSOLE
|
|||
config MAGIC_SYSRQ
|
||||
bool "Magic SysRq key"
|
||||
depends on MCONSOLE
|
||||
---help---
|
||||
help
|
||||
If you say Y here, you will have some control over the system even
|
||||
if the system crashes for example during kernel debugging (e.g., you
|
||||
will be able to flush the buffer cache to disk, reboot the system
|
||||
|
|
@ -195,8 +195,8 @@ config SMP
|
|||
simultaneously, depending on the host scheduler.
|
||||
|
||||
This, however, is supported only in TT mode. So, if you use the SKAS
|
||||
patch on your host, switching to TT mode and enabling SMP usually gives
|
||||
you worse performances.
|
||||
patch on your host, switching to TT mode and enabling SMP usually
|
||||
gives you worse performances.
|
||||
Also, since the support for SMP has been under-developed, there could
|
||||
be some bugs being exposed by enabling SMP.
|
||||
|
||||
|
|
@ -245,12 +245,13 @@ config UML_REAL_TIME_CLOCK
|
|||
bool "Real-time Clock"
|
||||
default y
|
||||
help
|
||||
This option makes UML time deltas match wall clock deltas. This should
|
||||
normally be enabled. The exception would be if you are debugging with
|
||||
UML and spend long times with UML stopped at a breakpoint. In this
|
||||
case, when UML is restarted, it will call the timer enough times to make
|
||||
up for the time spent at the breakpoint. This could result in a
|
||||
noticeable lag. If this is a problem, then disable this option.
|
||||
This option makes UML time deltas match wall clock deltas. This
|
||||
should normally be enabled. The exception would be if you are
|
||||
debugging with UML and spend long times with UML stopped at a
|
||||
breakpoint. In this case, when UML is restarted, it will call the
|
||||
timer enough times to make up for the time spent at the breakpoint.
|
||||
This could result in a noticeable lag. If this is a problem, then
|
||||
disable this option.
|
||||
|
||||
endmenu
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ config SSL_CHAN
|
|||
|
||||
config UNIX98_PTYS
|
||||
bool "Unix98 PTY support"
|
||||
---help---
|
||||
help
|
||||
A pseudo terminal (PTY) is a software device consisting of two
|
||||
halves: a master and a slave. The slave device behaves identical to
|
||||
a physical terminal; the master device is used by a process to
|
||||
|
|
@ -130,7 +130,7 @@ config UNIX98_PTYS
|
|||
config LEGACY_PTYS
|
||||
bool "Legacy (BSD) PTY support"
|
||||
default y
|
||||
---help---
|
||||
help
|
||||
A pseudo terminal (PTY) is a software device consisting of two
|
||||
halves: a master and a slave. The slave device behaves identical to
|
||||
a physical terminal; the master device is used by a process to
|
||||
|
|
@ -168,7 +168,7 @@ config LEGACY_PTY_COUNT
|
|||
int "Maximum number of legacy PTY in use"
|
||||
depends on LEGACY_PTYS
|
||||
default "256"
|
||||
---help---
|
||||
help
|
||||
The maximum number of legacy PTYs that can be used at any one time.
|
||||
The default is 256, and should be more than enough. Embedded
|
||||
systems may want to reduce this to save memory.
|
||||
|
|
@ -233,4 +233,3 @@ config MMAPPER
|
|||
UML.
|
||||
|
||||
endmenu
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# This file is included by the global makefile so that you can add your own
|
||||
# architecture-specific flags and dependencies.
|
||||
#
|
||||
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
# Licensed under the GPL
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* 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
|
||||
*/
|
||||
|
||||
|
|
@ -37,13 +37,3 @@ extern unsigned long *sc_sigmask(void *sc_ptr);
|
|||
extern int sc_get_fpregs(unsigned long buf, void *sc_ptr);
|
||||
|
||||
#endif
|
||||
/*
|
||||
* 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:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux,intel}.com)
|
||||
# Licensed under the GPL
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -3,16 +3,12 @@
|
|||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include "linux/mm.h"
|
||||
#include "linux/fs.h"
|
||||
#include "linux/module.h"
|
||||
#include "linux/sched.h"
|
||||
#include "linux/init_task.h"
|
||||
#include "linux/fs.h"
|
||||
#include "linux/module.h"
|
||||
#include "linux/mqueue.h"
|
||||
#include "asm/uaccess.h"
|
||||
#include "asm/pgtable.h"
|
||||
#include "mem_user.h"
|
||||
#include "os.h"
|
||||
|
||||
static struct fs_struct init_fs = INIT_FS;
|
||||
struct mm_struct init_mm = INIT_MM(init_mm);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
|
||||
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ void smp_send_stop(void)
|
|||
continue;
|
||||
os_write_file(cpu_data[i].ipi_pipe[1], "S", 1);
|
||||
}
|
||||
printk("done\n");
|
||||
printk(KERN_INFO "done\n");
|
||||
}
|
||||
|
||||
static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
|
||||
|
|
@ -80,7 +80,7 @@ static int idle_proc(void *cpup)
|
|||
|
||||
wmb();
|
||||
if (cpu_test_and_set(cpu, cpu_callin_map)) {
|
||||
printk("huh, CPU#%d already present??\n", cpu);
|
||||
printk(KERN_ERR "huh, CPU#%d already present??\n", cpu);
|
||||
BUG();
|
||||
}
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ void smp_prepare_cpus(unsigned int maxcpus)
|
|||
current->thread.mode.tt.extern_pid);
|
||||
|
||||
for (cpu = 1; cpu < ncpus; cpu++) {
|
||||
printk("Booting processor %d...\n", cpu);
|
||||
printk(KERN_INFO "Booting processor %d...\n", cpu);
|
||||
|
||||
idle = idle_thread(cpu);
|
||||
|
||||
|
|
@ -144,8 +144,8 @@ void smp_prepare_cpus(unsigned int maxcpus)
|
|||
cpu_relax();
|
||||
|
||||
if (cpu_isset(cpu, cpu_callin_map))
|
||||
printk("done\n");
|
||||
else printk("failed\n");
|
||||
printk(KERN_INFO "done\n");
|
||||
else printk(KERN_INFO "failed\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -187,13 +187,14 @@ void IPI_handler(int cpu)
|
|||
break;
|
||||
|
||||
case 'S':
|
||||
printk("CPU#%d stopping\n", cpu);
|
||||
printk(KERN_INFO "CPU#%d stopping\n", cpu);
|
||||
while (1)
|
||||
pause();
|
||||
break;
|
||||
|
||||
default:
|
||||
printk("CPU#%d received unknown IPI [%c]!\n", cpu, c);
|
||||
printk(KERN_ERR "CPU#%d received unknown IPI [%c]!\n",
|
||||
cpu, c);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,24 @@
|
|||
/*
|
||||
* Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
|
||||
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include "linux/kernel.h"
|
||||
#include "asm/errno.h"
|
||||
#include "linux/sched.h"
|
||||
#include "linux/mm.h"
|
||||
#include "linux/spinlock.h"
|
||||
#include "linux/init.h"
|
||||
#include "linux/ptrace.h"
|
||||
#include "asm/semaphore.h"
|
||||
#include "asm/pgtable.h"
|
||||
#include "asm/pgalloc.h"
|
||||
#include "asm/tlbflush.h"
|
||||
#include "asm/a.out.h"
|
||||
#include "asm/current.h"
|
||||
#include "asm/irq.h"
|
||||
#include "sysdep/sigcontext.h"
|
||||
#include "kern_util.h"
|
||||
#include "as-layout.h"
|
||||
#include <linux/mm.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/hardirq.h>
|
||||
#include <asm/current.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/tlbflush.h>
|
||||
#include "arch.h"
|
||||
#include "kern.h"
|
||||
#include "chan_kern.h"
|
||||
#include "mconsole_kern.h"
|
||||
#include "mem.h"
|
||||
#include "mem_kern.h"
|
||||
#include "as-layout.h"
|
||||
#include "kern_util.h"
|
||||
#include "os.h"
|
||||
#include "sysdep/sigcontext.h"
|
||||
#include "sysdep/ptrace.h"
|
||||
#include "os.h"
|
||||
#include "skas.h"
|
||||
#include "os.h"
|
||||
|
||||
/* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */
|
||||
/*
|
||||
* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by
|
||||
* segv().
|
||||
*/
|
||||
int handle_page_fault(unsigned long address, unsigned long ip,
|
||||
int is_write, int is_user, int *code_out)
|
||||
{
|
||||
|
|
@ -46,8 +32,10 @@ int handle_page_fault(unsigned long address, unsigned long ip,
|
|||
|
||||
*code_out = SEGV_MAPERR;
|
||||
|
||||
/* If the fault was during atomic operation, don't take the fault, just
|
||||
* fail. */
|
||||
/*
|
||||
* If the fault was during atomic operation, don't take the fault, just
|
||||
* fail.
|
||||
*/
|
||||
if (in_atomic())
|
||||
goto out_nosemaphore;
|
||||
|
||||
|
|
@ -98,7 +86,8 @@ survive:
|
|||
pte = pte_offset_kernel(pmd, address);
|
||||
} while (!pte_present(*pte));
|
||||
err = 0;
|
||||
/* The below warning was added in place of
|
||||
/*
|
||||
* The below warning was added in place of
|
||||
* pte_mkyoung(); if (is_write) pte_mkdirty();
|
||||
* If it's triggered, we'd see normally a hang here (a clean pte is
|
||||
* marked read-only to emulate the dirty bit).
|
||||
|
|
@ -112,7 +101,7 @@ survive:
|
|||
out:
|
||||
up_read(&mm->mmap_sem);
|
||||
out_nosemaphore:
|
||||
return(err);
|
||||
return err;
|
||||
|
||||
/*
|
||||
* We ran out of memory, or some other thing happened to us that made
|
||||
|
|
@ -175,11 +164,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
|
|||
}
|
||||
|
||||
if (SEGV_IS_FIXABLE(&fi) || SEGV_MAYBE_FIXABLE(&fi))
|
||||
err = handle_page_fault(address, ip, is_write, is_user, &si.si_code);
|
||||
err = handle_page_fault(address, ip, is_write, is_user,
|
||||
&si.si_code);
|
||||
else {
|
||||
err = -EFAULT;
|
||||
/* A thread accessed NULL, we get a fault, but CR2 is invalid.
|
||||
* This code is used in __do_copy_from_user() of TT mode. */
|
||||
/*
|
||||
* A thread accessed NULL, we get a fault, but CR2 is invalid.
|
||||
* This code is used in __do_copy_from_user() of TT mode.
|
||||
* XXX tt mode is gone, so maybe this isn't needed any more
|
||||
*/
|
||||
address = 0;
|
||||
}
|
||||
|
||||
|
|
@ -209,7 +202,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
|
|||
current->thread.arch.faultinfo = fi;
|
||||
force_sig_info(SIGBUS, &si, current);
|
||||
} else if (err == -ENOMEM) {
|
||||
printk("VM: killing process %s\n", current->comm);
|
||||
printk(KERN_INFO "VM: killing process %s\n", current->comm);
|
||||
do_exit(SIGKILL);
|
||||
} else {
|
||||
BUG_ON(err != -EFAULT);
|
||||
|
|
@ -228,8 +221,8 @@ void relay_signal(int sig, union uml_pt_regs *regs)
|
|||
|
||||
if (!UPT_IS_USER(regs)) {
|
||||
if (sig == SIGBUS)
|
||||
printk("Bus error - the host /dev/shm or /tmp mount "
|
||||
"likely just ran out of space\n");
|
||||
printk(KERN_ERR "Bus error - the host /dev/shm or /tmp "
|
||||
"mount likely just ran out of space\n");
|
||||
panic("Kernel mode signal %d", sig);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
|
||||
# Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
# Licensed under the GPL
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
|
||||
# Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
# Licensed under the GPL
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
/*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <stddef.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <time.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
#include "kern_util.h"
|
||||
#include "user.h"
|
||||
#include "process.h"
|
||||
#include "kern_constants.h"
|
||||
#include "os.h"
|
||||
#include "uml-config.h"
|
||||
#include "user.h"
|
||||
|
||||
int set_interval(int is_virtual)
|
||||
{
|
||||
|
|
@ -33,10 +29,12 @@ int set_interval(int is_virtual)
|
|||
void disable_timer(void)
|
||||
{
|
||||
struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }});
|
||||
|
||||
if ((setitimer(ITIMER_VIRTUAL, &disable, NULL) < 0) ||
|
||||
(setitimer(ITIMER_REAL, &disable, NULL) < 0))
|
||||
printk("disnable_timer - setitimer failed, errno = %d\n",
|
||||
errno);
|
||||
printk(UM_KERN_ERR "disable_timer - setitimer failed, "
|
||||
"errno = %d\n", errno);
|
||||
|
||||
/* If there are signals already queued, after unblocking ignore them */
|
||||
signal(SIGALRM, SIG_IGN);
|
||||
signal(SIGVTALRM, SIG_IGN);
|
||||
|
|
@ -60,8 +58,8 @@ void switch_timers(int to_real)
|
|||
|
||||
if ((setitimer(old, &disable, NULL) < 0) ||
|
||||
(setitimer(new, &enable, NULL)))
|
||||
printk("switch_timers - setitimer failed, errno = %d\n",
|
||||
errno);
|
||||
printk(UM_KERN_ERR "switch_timers - setitimer failed, "
|
||||
"errno = %d\n", errno);
|
||||
}
|
||||
|
||||
unsigned long long os_nsecs(void)
|
||||
|
|
@ -69,7 +67,7 @@ unsigned long long os_nsecs(void)
|
|||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
return((unsigned long long) tv.tv_sec * BILLION + tv.tv_usec * 1000);
|
||||
return (unsigned long long) tv.tv_sec * BILLION + tv.tv_usec * 1000;
|
||||
}
|
||||
|
||||
void idle_sleep(int secs)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/ptrace.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <asm/ldt.h>
|
||||
#include "sysdep/tls.h"
|
||||
#include "uml-config.h"
|
||||
|
||||
/* TLS support - we basically rely on the host's one.*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
#
|
||||
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
#
|
||||
|
||||
obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
|
||||
ptrace_user.o setjmp.o signal.o sigcontext.o stub.o stub_segv.o \
|
||||
syscalls.o sysrq.o sys_call_table.o tls.o
|
||||
|
|
|
|||
|
|
@ -1,19 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include "ptrace_user.h"
|
||||
/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
|
||||
#include <asm/user.h>
|
||||
#include "kern_util.h"
|
||||
#include "user.h"
|
||||
#include "os.h"
|
||||
#include "uml-config.h"
|
||||
#include <sys/ptrace.h>
|
||||
|
||||
int ptrace_getregs(long pid, unsigned long *regs_out)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue