Commit 37185b33 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger

um: get rid of pointless include "..." where include <...> will do

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 382d95fd
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include "chan.h" #include "chan.h"
#include "os.h" #include <os.h>
#include "irq_kern.h" #include <irq_kern.h>
#ifdef CONFIG_NOCONFIG_CHAN #ifdef CONFIG_NOCONFIG_CHAN
static void *not_configged_init(char *str, int device, static void *not_configged_init(char *str, int device,
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <termios.h> #include <termios.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
void generic_close(int fd, void *unused) void generic_close(int fd, void *unused)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __CHAN_USER_H__ #ifndef __CHAN_USER_H__
#define __CHAN_USER_H__ #define __CHAN_USER_H__
#include "init.h" #include <init.h>
struct chan_opts { struct chan_opts {
void (*const announce)(char *dev_name, int dev); void (*const announce)(char *dev_name, int dev);
......
#ifndef __COW_SYS_H__ #ifndef __COW_SYS_H__
#define __COW_SYS_H__ #define __COW_SYS_H__
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
static inline void *cow_malloc(int size) static inline void *cow_malloc(int size)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __DAEMON_H__ #ifndef __DAEMON_H__
#define __DAEMON_H__ #define __DAEMON_H__
#include "net_user.h" #include <net_user.h>
#define SWITCH_VERSION 3 #define SWITCH_VERSION 3
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under the GPL. * Licensed under the GPL.
*/ */
#include "linux/init.h" #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "net_kern.h" #include <net_kern.h>
#include "daemon.h" #include "daemon.h"
struct daemon_init { struct daemon_init {
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/un.h> #include <sys/un.h>
#include "daemon.h" #include "daemon.h"
#include "net_user.h" #include <net_user.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
enum request_type { REQ_NEW_CONTROL }; enum request_type { REQ_NEW_CONTROL };
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <errno.h> #include <errno.h>
#include <termios.h> #include <termios.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
struct fd_chan { struct fd_chan {
int fd; int fd;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include "os.h" #include <os.h>
struct dog_data { struct dog_data {
int stdin; int stdin;
......
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/fs.h" #include <linux/fs.h>
#include "linux/module.h" #include <linux/module.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "linux/sound.h" #include <linux/sound.h>
#include "linux/soundcard.h" #include <linux/soundcard.h>
#include "linux/mutex.h" #include <linux/mutex.h>
#include "asm/uaccess.h" #include <asm/uaccess.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
struct hostaudio_state { struct hostaudio_state {
int fd; int fd;
......
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/irqreturn.h" #include <linux/irqreturn.h>
#include "linux/kd.h" #include <linux/kd.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "chan.h" #include "chan.h"
#include "irq_kern.h" #include <irq_kern.h>
#include "irq_user.h" #include <irq_user.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#define LINE_BUFSIZE 4096 #define LINE_BUFSIZE 4096
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
#ifndef __LINE_H__ #ifndef __LINE_H__
#define __LINE_H__ #define __LINE_H__
#include "linux/list.h" #include <linux/list.h>
#include "linux/workqueue.h" #include <linux/workqueue.h>
#include "linux/tty.h" #include <linux/tty.h>
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "linux/spinlock.h" #include <linux/spinlock.h>
#include "linux/mutex.h" #include <linux/mutex.h>
#include "chan_user.h" #include "chan_user.h"
#include "mconsole_kern.h" #include "mconsole_kern.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define u32 uint32_t #define u32 uint32_t
#endif #endif
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#define MCONSOLE_MAGIC (0xcafebabe) #define MCONSOLE_MAGIC (0xcafebabe)
#define MCONSOLE_MAX_DATA (512) #define MCONSOLE_MAX_DATA (512)
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include "init.h" #include <init.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "irq_user.h" #include <irq_user.h>
#include "kern_util.h" #include <kern_util.h>
#include "mconsole.h" #include "mconsole.h"
#include "mconsole_kern.h" #include "mconsole_kern.h"
#include "os.h" #include <os.h>
static int do_unlink_socket(struct notifier_block *notifier, static int do_unlink_socket(struct notifier_block *notifier,
unsigned long what, void *data) unsigned long what, void *data)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __MCONSOLE_KERN_H__ #ifndef __MCONSOLE_KERN_H__
#define __MCONSOLE_KERN_H__ #define __MCONSOLE_KERN_H__
#include "linux/list.h" #include <linux/list.h>
#include "mconsole.h" #include "mconsole.h"
struct mconsole_entry { struct mconsole_entry {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "mem_user.h" #include <mem_user.h>
/* These are set in mmapper_init, which is called at boot time */ /* These are set in mmapper_init, which is called at boot time */
static unsigned long mmapper_size; static unsigned long mmapper_size;
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include "init.h" #include <init.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "irq_user.h" #include <irq_user.h>
#include "mconsole_kern.h" #include "mconsole_kern.h"
#include "net_kern.h" #include <net_kern.h>
#include "net_user.h" #include <net_user.h>
#define DRIVER_NAME "uml-netdev" #define DRIVER_NAME "uml-netdev"
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "net_user.h" #include <net_user.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
int tap_open_common(void *dev, char *gate_addr) int tap_open_common(void *dev, char *gate_addr)
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
/* This address is used only as a unique identifier */ /* This address is used only as a unique identifier */
static int null_chan; static int null_chan;
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Licensed under the GPL. * Licensed under the GPL.
*/ */
#include "linux/init.h" #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "net_kern.h" #include <net_kern.h>
#include "pcap_user.h" #include "pcap_user.h"
struct pcap_init { struct pcap_init {
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <pcap.h> #include <pcap.h>
#include <string.h> #include <string.h>
#include <asm/types.h> #include <asm/types.h>
#include "net_user.h" #include <net_user.h>
#include "pcap_user.h" #include "pcap_user.h"
#include "um_malloc.h" #include <um_malloc.h>
#define PCAP_FD(p) (*(int *)(p)) #define PCAP_FD(p) (*(int *)(p))
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "net_user.h" #include <net_user.h>
struct pcap_data { struct pcap_data {
char *host_if; char *host_if;
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/completion.h" #include <linux/completion.h>
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "linux/list.h" #include <linux/list.h>
#include "linux/mutex.h" #include <linux/mutex.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "linux/workqueue.h" #include <linux/workqueue.h>
#include "asm/atomic.h" #include <asm/atomic.h>
#include "init.h" #include <init.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "os.h" #include <os.h>
#include "port.h" #include "port.h"
struct port_list { struct port_list {
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> #include <netinet/in.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "port.h" #include "port.h"
#include "um_malloc.h" #include <um_malloc.h>
struct port_chan { struct port_chan {
int raw; int raw;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <termios.h> #include <termios.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
struct pty_chan { struct pty_chan {
void (*announce)(char *dev_name, int dev); void (*announce)(char *dev_name, int dev);
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "os.h" #include <os.h>
/* /*
* core module and version information * core module and version information
......
#include <string.h> #include <string.h>
#include "slip_common.h" #include "slip_common.h"
#include "net_user.h" #include <net_user.h>
int slip_proto_read(int fd, void *buf, int len, struct slip_proto *slip) int slip_proto_read(int fd, void *buf, int len, struct slip_proto *slip)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "net_kern.h" #include <net_kern.h>
#include "slip.h" #include "slip.h"
struct slip_init { struct slip_init {
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include <string.h> #include <string.h>
#include <sys/termios.h> #include <sys/termios.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "net_user.h" #include <net_user.h>
#include "os.h" #include <os.h>
#include "slip.h" #include "slip.h"
#include "um_malloc.h" #include <um_malloc.h>
static int slip_user_init(void *data, void *dev) static int slip_user_init(void *data, void *dev)
{ {
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
*/ */
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include "linux/init.h" #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/string.h> #include <linux/string.h>
#include "net_kern.h" #include <net_kern.h>
#include "net_user.h" #include <net_user.h>
#include "slirp.h" #include "slirp.h"
struct slirp_init { struct slirp_init {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "net_user.h" #include <net_user.h>
#include "os.h" #include <os.h>
#include "slirp.h" #include "slirp.h"
static int slirp_user_init(void *data, void *dev) static int slirp_user_init(void *data, void *dev)
......
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/fs.h" #include <linux/fs.h>
#include "linux/tty.h" #include <linux/tty.h>
#include "linux/tty_driver.h" #include <linux/tty_driver.h>
#include "linux/major.h" #include <linux/major.h>
#include "linux/mm.h" #include <linux/mm.h>
#include "linux/init.h" #include <linux/init.h>
#include "linux/console.h" #include <linux/console.h>
#include "asm/termbits.h" #include <asm/termbits.h>
#include "asm/irq.h" #include <asm/irq.h>
#include "ssl.h" #include "ssl.h"
#include "chan.h" #include "chan.h"
#include "init.h" #include <init.h>
#include "irq_user.h" #include <irq_user.h>
#include "mconsole_kern.h" #include "mconsole_kern.h"
static const int ssl_version = 1; static const int ssl_version = 1;
......
...@@ -3,27 +3,27 @@ ...@@ -3,27 +3,27 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/posix_types.h" #include <linux/posix_types.h>
#include "linux/tty.h" #include <linux/tty.h>
#include "linux/tty_flip.h" #include <linux/tty_flip.h>
#include "linux/types.h" #include <linux/types.h>
#include "linux/major.h" #include <linux/major.h>
#include "linux/kdev_t.h" #include <linux/kdev_t.h>
#include "linux/console.h" #include <linux/console.h>
#include "linux/string.h" #include <linux/string.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/list.h" #include <linux/list.h>
#include "linux/init.h" #include <linux/init.h>
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "linux/hardirq.h" #include <linux/hardirq.h>
#include "asm/current.h" #include <asm/current.h>
#include "asm/irq.h" #include <asm/irq.h>
#include "stdio_console.h" #include "stdio_console.h"
#include "chan.h" #include "chan.h"
#include "irq_user.h" #include <irq_user.h>
#include "mconsole_kern.h" #include "mconsole_kern.h"
#include "init.h" #include <init.h>
#define MAX_TTYS (16) #define MAX_TTYS (16)
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <termios.h> #include <termios.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
struct tty_chan { struct tty_chan {
char *dev; char *dev;
......
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "kern_util.h" #include <kern_util.h>
#include "mconsole_kern.h" #include "mconsole_kern.h"
#include "init.h" #include <init.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "ubd.h" #include "ubd.h"
#include "os.h" #include <os.h>
#include "cow.h" #include "cow.h"
enum ubd_req { UBD_READ, UBD_WRITE }; enum ubd_req { UBD_READ, UBD_WRITE };
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <byteswap.h> #include <byteswap.h>
#include "ubd.h" #include "ubd.h"
#include "os.h" #include <os.h>
void ignore_sigwinch_sig(void) void ignore_sigwinch_sig(void)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __DRIVERS_UMCAST_H #ifndef __DRIVERS_UMCAST_H
#define __DRIVERS_UMCAST_H #define __DRIVERS_UMCAST_H
#include "net_user.h" #include <net_user.h>
struct umcast_data { struct umcast_data {
char *addr; char *addr;
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
* Licensed under the GPL. * Licensed under the GPL.
*/ */
#include "linux/init.h" #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "umcast.h" #include "umcast.h"
#include "net_kern.h" #include <net_kern.h>
struct umcast_init { struct umcast_init {
char *addr; char *addr;
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <errno.h> #include <errno.h>
#include <netinet/in.h> #include <netinet/in.h>
#include "umcast.h" #include "umcast.h"
#include "net_user.h" #include <net_user.h>
#include "um_malloc.h" #include <um_malloc.h>
static struct sockaddr_in *new_addr(char *addr, unsigned short port) static struct sockaddr_in *new_addr(char *addr, unsigned short port)
{ {
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
* *
*/ */
#include "linux/init.h" #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "net_kern.h" #include <net_kern.h>
#include "net_user.h" #include <net_user.h>
#include "vde.h" #include "vde.h"
static void vde_init(struct net_device *dev, void *data) static void vde_init(struct net_device *dev, void *data)
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include <stddef.h> #include <stddef.h>
#include <errno.h> #include <errno.h>
#include <libvdeplug.h> #include <libvdeplug.h>
#include "net_user.h" #include <net_user.h>
#include "um_malloc.h" #include <um_malloc.h>
#include "vde.h" #include "vde.h"
static int vde_user_init(void *data, void *dev) static int vde_user_init(void *data, void *dev)
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include "chan_user.h" #include "chan_user.h"
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
#include "xterm.h" #include "xterm.h"
struct xterm_chan { struct xterm_chan {
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/irqreturn.h> #include <linux/irqreturn.h>
#include <asm/irq.h> #include <asm/irq.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "os.h" #include <os.h>
struct xterm_wait { struct xterm_wait {
struct completion ready; struct completion ready;
......
#ifndef __UM_DMA_H #ifndef __UM_DMA_H
#define __UM_DMA_H #define __UM_DMA_H
#include "asm/io.h" #include <asm/io.h>
extern unsigned long uml_physmem; extern unsigned long uml_physmem;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __ARCH_UM_MMU_H #ifndef __ARCH_UM_MMU_H
#define __ARCH_UM_MMU_H #define __ARCH_UM_MMU_H
#include "mm_id.h" #include <mm_id.h>
#include <asm/mm_context.h> #include <asm/mm_context.h>
typedef struct mm_context { typedef struct mm_context {
......
...@@ -99,7 +99,7 @@ extern unsigned long uml_physmem; ...@@ -99,7 +99,7 @@ extern unsigned long uml_physmem;
#define __va_space (8*1024*1024) #define __va_space (8*1024*1024)
#include "mem.h" #include <mem.h>
/* Cast to unsigned long before casting to void * to avoid a warning from /* Cast to unsigned long before casting to void * to avoid a warning from
* mmap_kmem about cutting a long long down to a void *. Not sure that * mmap_kmem about cutting a long long down to a void *. Not sure that
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
pte_present gives true */ pte_present gives true */
#ifdef CONFIG_3_LEVEL_PGTABLES #ifdef CONFIG_3_LEVEL_PGTABLES
#include "asm/pgtable-3level.h" #include <asm/pgtable-3level.h>
#else #else
#include "asm/pgtable-2level.h" #include <asm/pgtable-2level.h>
#endif #endif
extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
......
...@@ -10,9 +10,9 @@ struct pt_regs; ...@@ -10,9 +10,9 @@ struct pt_regs;
struct task_struct; struct task_struct;
#include "asm/ptrace.h" #include <asm/ptrace.h>
#include "registers.h" #include <registers.h>
#include "sysdep/archsetjmp.h" #include <sysdep/archsetjmp.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/ptrace-abi.h> #include <asm/ptrace-abi.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
struct pt_regs { struct pt_regs {
struct uml_pt_regs regs; struct uml_pt_regs regs;
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#include "linux/bitops.h" #include <linux/bitops.h>
#include "asm/current.h" #include <asm/current.h>
#include "linux/cpumask.h" #include <linux/cpumask.h>
#define raw_smp_processor_id() (current_thread->cpu) #define raw_smp_processor_id() (current_thread->cpu)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __ARCH_H__ #ifndef __ARCH_H__
#define __ARCH_H__ #define __ARCH_H__
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
extern void arch_check_bugs(void); extern void arch_check_bugs(void);
extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs); extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs);
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
struct cpu_task { struct cpu_task {
int pid; int pid;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#ifndef __IRQ_KERN_H__ #ifndef __IRQ_KERN_H__
#define __IRQ_KERN_H__ #define __IRQ_KERN_H__
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "asm/ptrace.h" #include <asm/ptrace.h>
extern int um_request_irq(unsigned int irq, int fd, int type, extern int um_request_irq(unsigned int irq, int fd, int type,
irq_handler_t handler, irq_handler_t handler,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __IRQ_USER_H__ #ifndef __IRQ_USER_H__
#define __IRQ_USER_H__ #define __IRQ_USER_H__
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
struct irq_fd { struct irq_fd {
struct irq_fd *next; struct irq_fd *next;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#ifndef __KERN_UTIL_H__ #ifndef __KERN_UTIL_H__
#define __KERN_UTIL_H__ #define __KERN_UTIL_H__
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include "sysdep/faultinfo.h" #include <sysdep/faultinfo.h>
struct siginfo; struct siginfo;
......
#ifndef __UML_LONGJMP_H #ifndef __UML_LONGJMP_H
#define __UML_LONGJMP_H #define __UML_LONGJMP_H
#include "sysdep/archsetjmp.h" #include <sysdep/archsetjmp.h>
#include "os.h" #include <os.h>
extern int setjmp(jmp_buf); extern int setjmp(jmp_buf);
extern void longjmp(jmp_buf, int); extern void longjmp(jmp_buf, int);
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#define __OS_H__ #define __OS_H__
#include <stdarg.h> #include <stdarg.h>
#include "irq_user.h" #include <irq_user.h>
#include "longjmp.h" #include <longjmp.h>
#include "mm_id.h" #include <mm_id.h>
#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#ifndef __REGISTERS_H #ifndef __REGISTERS_H
#define __REGISTERS_H #define __REGISTERS_H
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include "sysdep/archsetjmp.h" #include <sysdep/archsetjmp.h>
extern int save_fp_registers(int pid, unsigned long *fp_regs); extern int save_fp_registers(int pid, unsigned long *fp_regs);
extern int restore_fp_registers(int pid, unsigned long *fp_regs); extern int restore_fp_registers(int pid, unsigned long *fp_regs);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __SKAS_H #ifndef __SKAS_H
#define __SKAS_H #define __SKAS_H
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
extern int userspace_pid[]; extern int userspace_pid[];
extern int proc_mm, ptrace_faultinfo, ptrace_ldt; extern int proc_mm, ptrace_faultinfo, ptrace_ldt;
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
#define PTRACE_FAULTINFO 52 #define PTRACE_FAULTINFO 52
#define PTRACE_SWITCH_MM 55 #define PTRACE_SWITCH_MM 55
#include "sysdep/skas_ptrace.h" #include <sysdep/skas_ptrace.h>
#endif #endif
#include "sysdep/kernel-offsets.h" #include <sysdep/kernel-offsets.h>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "init.h" #include <init.h>
static __initdata const char *config[] = { static __initdata const char *config[] = {
"CONFIG" "CONFIG"
......
...@@ -89,7 +89,7 @@ SECTIONS ...@@ -89,7 +89,7 @@ SECTIONS
.kstrtab : { *(.kstrtab) } .kstrtab : { *(.kstrtab) }
#include "asm/common.lds.S" #include <asm/common.lds.S>
init.data : { INIT_DATA } init.data : { INIT_DATA }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/init.h> #include <linux/init.h>
#include "os.h" #include <os.h>
static void early_console_write(struct console *con, const char *s, unsigned int n) static void early_console_write(struct console *con, const char *s, unsigned int n)
{ {
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include <asm/current.h> #include <asm/current.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "as-layout.h" #include <as-layout.h>
#include "mem_user.h" #include <mem_user.h>
#include "skas.h" #include <skas.h>
#include "os.h" #include <os.h>
#include "internal.h" #include "internal.h"
void flush_thread(void) void flush_thread(void)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/module.h" #include <linux/module.h>
extern void __bb_init_func(void *) __attribute__((weak)); extern void __bb_init_func(void *) __attribute__((weak));
EXPORT_SYMBOL(__bb_init_func); EXPORT_SYMBOL(__bb_init_func);
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/module.h" #include <linux/module.h>
extern void mcount(void); extern void mcount(void);
EXPORT_SYMBOL(mcount); EXPORT_SYMBOL(mcount);
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/init.h" #include <linux/init.h>
#include "linux/bootmem.h" #include <linux/bootmem.h>
#include "linux/initrd.h" #include <linux/initrd.h>
#include "asm/types.h" #include <asm/types.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
/* Changed by uml_initrd_setup, which is a setup */ /* Changed by uml_initrd_setup, which is a setup */
static char *initrd __initdata = NULL; static char *initrd __initdata = NULL;
......
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
* Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar * Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
*/ */
#include "linux/cpumask.h" #include <linux/cpumask.h>
#include "linux/hardirq.h" #include <linux/hardirq.h>
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "linux/kernel_stat.h" #include <linux/kernel_stat.h>
#include "linux/module.h" #include <linux/module.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/seq_file.h" #include <linux/seq_file.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "as-layout.h" #include <as-layout.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
/* /*
* This list is accessed under irq_lock, except in sigio_handler, * This list is accessed under irq_lock, except in sigio_handler,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include "os.h" #include <os.h>
EXPORT_SYMBOL(set_signals); EXPORT_SYMBOL(set_signals);
EXPORT_SYMBOL(get_signals); EXPORT_SYMBOL(get_signals);
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
#include <asm/page.h> #include <asm/page.h>
#include "as-layout.h" #include <as-layout.h>
#include "init.h" #include <init.h>
#include "kern.h" #include <kern.h>
#include "kern_util.h" #include <kern_util.h>
#include "mem_user.h" #include <mem_user.h>
#include "os.h" #include <os.h>
/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */ /* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
unsigned long *empty_zero_page = NULL; unsigned long *empty_zero_page = NULL;
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "as-layout.h" #include <as-layout.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
/* /*
* This is a per-cpu array. A processor only modifies its entry and it only * This is a per-cpu array. A processor only modifies its entry and it only
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/spinlock.h" #include <linux/spinlock.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "linux/oom.h" #include <linux/oom.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
void (*pm_power_off)(void); void (*pm_power_off)(void);
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
*/ */
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "irq_kern.h" #include <irq_kern.h>
#include "os.h" #include <os.h>
#include "sigio.h" #include <sigio.h>
/* Protected by sigio_lock() called from write_sigio_workaround */ /* Protected by sigio_lock() called from write_sigio_workaround */
static int sigio_irq_fd = -1; static int sigio_irq_fd = -1;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <asm/siginfo.h> #include <asm/siginfo.h>
#include <asm/signal.h> #include <asm/signal.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "frame_kern.h" #include <frame_kern.h>
#include "kern_util.h" #include <kern_util.h>
EXPORT_SYMBOL(block_signals); EXPORT_SYMBOL(block_signals);
EXPORT_SYMBOL(unblock_signals); EXPORT_SYMBOL(unblock_signals);
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
#include <sched.h> #include <sched.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include "as-layout.h" #include <as-layout.h>
#include "ptrace_user.h" #include <ptrace_user.h>
#include "stub-data.h" #include <stub-data.h>
#include "sysdep/stub.h" #include <sysdep/stub.h>
/* /*
* This is in a separate file because it needs to be compiled with any * This is in a separate file because it needs to be compiled with any
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/mm.h" #include <linux/mm.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/slab.h" #include <linux/slab.h>
#include "asm/pgalloc.h" #include <asm/pgalloc.h>
#include "asm/pgtable.h" #include <asm/pgtable.h>
#include "as-layout.h" #include <as-layout.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
extern int __syscall_stub_start; extern int __syscall_stub_start;
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/init.h" #include <linux/init.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "as-layout.h" #include <as-layout.h>
#include "kern.h" #include <kern.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
int new_mm(unsigned long stack) int new_mm(unsigned long stack)
{ {
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/kernel.h" #include <linux/kernel.h>
#include "linux/ptrace.h" #include <linux/ptrace.h>
#include "kern_util.h" #include <kern_util.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include "sysdep/syscalls.h" #include <sysdep/syscalls.h>
extern int syscall_table_size; extern int syscall_table_size;
#define NR_SYSCALLS (syscall_table_size / sizeof(void *)) #define NR_SYSCALLS (syscall_table_size / sizeof(void *))
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <asm/current.h> #include <asm/current.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr) pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
{ {
......
...@@ -3,24 +3,24 @@ ...@@ -3,24 +3,24 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/percpu.h" #include <linux/percpu.h>
#include "asm/pgalloc.h" #include <asm/pgalloc.h>
#include "asm/tlb.h" #include <asm/tlb.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/module.h" #include <linux/module.h>
#include "linux/threads.h" #include <linux/threads.h>
#include "linux/interrupt.h" #include <linux/interrupt.h>
#include "linux/err.h" #include <linux/err.h>
#include "linux/hardirq.h" #include <linux/hardirq.h>
#include "asm/smp.h" #include <asm/smp.h>
#include "asm/processor.h" #include <asm/processor.h>
#include "asm/spinlock.h" #include <asm/spinlock.h>
#include "kern.h" #include <kern.h>
#include "irq_user.h" #include <irq_user.h>
#include "os.h" #include <os.h>
/* Per CPU bogomips and other parameters /* Per CPU bogomips and other parameters
* The only piece used here is the ipi pipe, which is set before SMP is * The only piece used here is the ipi pipe, which is set before SMP is
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/file.h" #include <linux/file.h>
#include "linux/fs.h" #include <linux/fs.h>
#include "linux/mm.h" #include <linux/mm.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "linux/utsname.h" #include <linux/utsname.h>
#include "linux/syscalls.h" #include <linux/syscalls.h>
#include "asm/current.h" #include <asm/current.h>
#include "asm/mman.h" #include <asm/mman.h>
#include "asm/uaccess.h" #include <asm/uaccess.h>
#include "asm/unistd.h" #include <asm/unistd.h>
#include "internal.h" #include "internal.h"
long sys_fork(void) long sys_fork(void)
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/threads.h> #include <linux/threads.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/param.h> #include <asm/param.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs) void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
{ {
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "as-layout.h" #include <as-layout.h>
#include "mem_user.h" #include <mem_user.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
struct host_vm_change { struct host_vm_change {
struct host_vm_op { struct host_vm_op {
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include <asm/current.h> #include <asm/current.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "arch.h" #include <arch.h>
#include "as-layout.h" #include <as-layout.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
/* /*
* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by * Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/setup.h> #include <asm/setup.h>
#include "as-layout.h" #include <as-layout.h>
#include "arch.h" #include <arch.h>
#include "init.h" #include <init.h>
#include "kern.h" #include <kern.h>
#include "kern_util.h" #include <kern_util.h>
#include "mem_user.h" #include <mem_user.h>
#include "os.h" #include <os.h>
#define DEFAULT_COMMAND_LINE "root=98:0" #define DEFAULT_COMMAND_LINE "root=98:0"
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
*/ */
#include <asm/errno.h> #include <asm/errno.h>
#include "init.h" #include <init.h>
#include "kern.h" #include <kern.h>
#include "os.h" #include <os.h>
/* Changed by set_umid_arg */ /* Changed by set_umid_arg */
static int umid_inited = 0; static int umid_inited = 0;
......
...@@ -60,7 +60,7 @@ SECTIONS ...@@ -60,7 +60,7 @@ SECTIONS
PROVIDE_HIDDEN(__rela_iplt_end = .); PROVIDE_HIDDEN(__rela_iplt_end = .);
} }
#include "asm/common.lds.S" #include <asm/common.lds.S>
init.data : { INIT_DATA } init.data : { INIT_DATA }
.data : .data :
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "aio.h" #include <aio.h>
#include "init.h" #include <init.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
struct aio_thread_req { struct aio_thread_req {
enum aio_type type; enum aio_type type;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __DRIVERS_ETAP_H #ifndef __DRIVERS_ETAP_H
#define __DRIVERS_ETAP_H #define __DRIVERS_ETAP_H
#include "net_user.h" #include <net_user.h>
struct ethertap_data { struct ethertap_data {
char *dev_name; char *dev_name;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include "etap.h" #include "etap.h"
#include "net_kern.h" #include <net_kern.h>
struct ethertap_init { struct ethertap_init {
char *dev_name; char *dev_name;
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "etap.h" #include "etap.h"
#include "os.h" #include <os.h>
#include "net_user.h" #include <net_user.h>
#include "um_malloc.h" #include <um_malloc.h>
#define MAX_PACKET ETH_MAX_PACKET #define MAX_PACKET ETH_MAX_PACKET
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __UM_TUNTAP_H #ifndef __UM_TUNTAP_H
#define __UM_TUNTAP_H #define __UM_TUNTAP_H
#include "net_user.h" #include <net_user.h>
struct tuntap_data { struct tuntap_data {
char *dev_name; char *dev_name;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <asm/errno.h> #include <asm/errno.h>
#include "net_kern.h" #include <net_kern.h>
#include "tuntap.h" #include "tuntap.h"
struct tuntap_init { struct tuntap_init {
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/uio.h> #include <sys/uio.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "tuntap.h" #include "tuntap.h"
static int tuntap_user_init(void *data, void *dev) static int tuntap_user_init(void *data, void *dev)
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
*/ */
#include <elf.h> #include <elf.h>
#include <stddef.h> #include <stddef.h>
#include "init.h" #include <init.h>
#include "elf_user.h" #include <elf_user.h>
#include "mem_user.h" #include <mem_user.h>
typedef Elf32_auxv_t elf_auxv_t; typedef Elf32_auxv_t elf_auxv_t;
......
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
#include <limits.h> #include <limits.h>
#ifndef TEST #ifndef TEST
#include "um_malloc.h" #include <um_malloc.h>
#else #else
#include <stdio.h> #include <stdio.h>
#define um_kmalloc malloc #define um_kmalloc malloc
#endif #endif
#include "os.h" #include <os.h>
/* Execute FILE, searching in the `PATH' environment variable if it contains /* Execute FILE, searching in the `PATH' environment variable if it contains
no slashes, with arguments ARGV and environment from `environ'. */ no slashes, with arguments ARGV and environment from `environ'. */
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/un.h> #include <sys/un.h>
#include "os.h" #include <os.h>
static void copy_stat(struct uml_stat *dst, const struct stat64 *src) static void copy_stat(struct uml_stat *dst, const struct stat64 *src)
{ {
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <linux/limits.h> #include <linux/limits.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
struct helper_data { struct helper_data {
void (*pre_exec)(void*); void (*pre_exec)(void*);
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#include <poll.h> #include <poll.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include "irq_user.h" #include <irq_user.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
/* /*
* Locked by irq_lock in arch/um/kernel/irq.c. Changed by os_create_pollfd * Locked by irq_lock in arch/um/kernel/irq.c. Changed by os_create_pollfd
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "as-layout.h" #include <as-layout.h>
#include "init.h" #include <init.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "um_malloc.h" #include <um_malloc.h>
#define PGD_BOUND (4 * 1024 * 1024) #define PGD_BOUND (4 * 1024 * 1024)
#define STACKSIZE (8 * 1024 * 1024) #define STACKSIZE (8 * 1024 * 1024)
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/param.h> #include <sys/param.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
/* Modified by which_tmpdir, which is called during early boot */ /* Modified by which_tmpdir, which is called during early boot */
static char *default_tmpdir = "/tmp"; static char *default_tmpdir = "/tmp";
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "init.h" #include <init.h>
#include "longjmp.h" #include <longjmp.h>
#include "os.h" #include <os.h>
#include "skas_ptrace.h" #include <skas_ptrace.h>
#define ARBITRARY_ADDR -1 #define ARBITRARY_ADDR -1
#define FAILURE_PID -1 #define FAILURE_PID -1
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include "sysdep/ptrace_user.h" #include <sysdep/ptrace_user.h>
#include "registers.h" #include <registers.h>
int save_registers(int pid, struct uml_pt_regs *regs) int save_registers(int pid, struct uml_pt_regs *regs)
{ {
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include "kern_util.h" #include <kern_util.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
#include "sigio.h" #include <sigio.h>
#include "um_malloc.h" #include <um_malloc.h>
/* /*
* Protected by sigio_lock(), also used by sigio_cleanup, which is an * Protected by sigio_lock(), also used by sigio_cleanup, which is an
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <strings.h> #include <strings.h>
#include "as-layout.h" #include <as-layout.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "sysdep/mcontext.h" #include <sysdep/mcontext.h>
#include "internal.h" #include "internal.h"
void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = { void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = {
......
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "init.h" #include <init.h>
#include "as-layout.h" #include <as-layout.h>
#include "mm_id.h" #include <mm_id.h>
#include "os.h" #include <os.h>
#include "proc_mm.h" #include <proc_mm.h>
#include "ptrace_user.h" #include <ptrace_user.h>
#include "registers.h" #include <registers.h>
#include "skas.h" #include <skas.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include "sysdep/stub.h" #include <sysdep/stub.h>
extern unsigned long batch_syscall_stub, __syscall_stub_start; extern unsigned long batch_syscall_stub, __syscall_stub_start;
......
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "as-layout.h" #include <as-layout.h>
#include "init.h" #include <init.h>
#include "kern_util.h" #include <kern_util.h>
#include "mem.h" #include <mem.h>
#include "os.h" #include <os.h>
#include "proc_mm.h" #include <proc_mm.h>
#include "ptrace_user.h" #include <ptrace_user.h>
#include "registers.h" #include <registers.h>
#include "skas.h" #include <skas.h>
#include "skas_ptrace.h" #include <skas_ptrace.h>
#include "sysdep/stub.h" #include <sysdep/stub.h>
int is_skas_winch(int pid, int fd, void *data) int is_skas_winch(int pid, int fd, void *data)
{ {
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
#include "mem_user.h" #include <mem_user.h>
#include "ptrace_user.h" #include <ptrace_user.h>
#include "registers.h" #include <registers.h>
#include "skas.h" #include <skas.h>
#include "skas_ptrace.h" #include <skas_ptrace.h>
static void ptrace_child(void) static void ptrace_child(void)
{ {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
#include "internal.h" #include "internal.h"
int set_interval(void) int set_interval(void)
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "kern_util.h" #include <kern_util.h>
#include "os.h" #include <os.h>
struct grantpt_info { struct grantpt_info {
int fd; int fd;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "init.h" #include <init.h>
#include "os.h" #include <os.h>
#define UML_DIR "~/.uml/" #define UML_DIR "~/.uml/"
......
#include "linux/types.h" #include <linux/types.h>
#include "linux/module.h" #include <linux/module.h>
/* Some of this are builtin function (some are not but could in the future), /* Some of this are builtin function (some are not but could in the future),
* so I *must* declare good prototypes for them and then EXPORT them. * so I *must* declare good prototypes for them and then EXPORT them.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <wait.h> #include <wait.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include "os.h" #include <os.h>
void stack_protections(unsigned long address) void stack_protections(unsigned long address)
{ {
......
#include "linux/threads.h" #include <linux/threads.h>
#include "linux/stddef.h" // for NULL #include <linux/stddef.h> // for NULL
#include "linux/elf.h" // for AT_NULL #include <linux/elf.h> // for AT_NULL
/* The following function nicked from arch/ppc/kernel/process.c and /* The following function nicked from arch/ppc/kernel/process.c and
* adapted slightly */ * adapted slightly */
......
#include "linux/sched.h" #include <linux/sched.h>
#include "asm/ptrace.h" #include "asm/ptrace.h"
int putreg(struct task_struct *child, unsigned long regno, int putreg(struct task_struct *child, unsigned long regno,
......
#include <errno.h> #include <errno.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
int ptrace_getregs(long pid, unsigned long *regs_out) int ptrace_getregs(long pid, unsigned long *regs_out)
{ {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef __SYS_PTRACE_PPC_H #ifndef __SYS_PTRACE_PPC_H
#define __SYS_PTRACE_PPC_H #define __SYS_PTRACE_PPC_H
#include "linux/types.h" #include <linux/types.h>
/* the following taken from <asm-ppc/ptrace.h> */ /* the following taken from <asm-ppc/ptrace.h> */
......
#include "asm/ptrace.h" #include "asm/ptrace.h"
#include "asm/sigcontext.h" #include "asm/sigcontext.h"
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/kernel.h" #include <linux/kernel.h>
#include "linux/smp.h" #include <linux/smp.h>
#include "asm/ptrace.h" #include "asm/ptrace.h"
#include "sysrq.h" #include "sysrq.h"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define __UM_ELF_X86_H #define __UM_ELF_X86_H
#include <asm/user.h> #include <asm/user.h>
#include "skas.h" #include <skas.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
*/ */
#include <signal.h> #include <signal.h>
#include "kern_util.h" #include <kern_util.h>
#include "longjmp.h" #include <longjmp.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
#include <generated/asm-offsets.h> #include <generated/asm-offsets.h>
/* Set during early boot */ /* Set during early boot */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
void arch_check_bugs(void) void arch_check_bugs(void)
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
/* These two are from asm-um/uaccess.h and linux/module.h, check them. */ /* These two are from asm-um/uaccess.h and linux/module.h, check them. */
struct exception_table_entry struct exception_table_entry
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include "os.h" #include <os.h>
#include "proc_mm.h" #include <proc_mm.h>
#include "skas.h" #include <skas.h>
#include "skas_ptrace.h" #include <skas_ptrace.h>
#include "sysdep/tls.h" #include <sysdep/tls.h>
extern int modify_ldt(int func, void *ptr, unsigned long bytecount); extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
......
#include "linux/mm.h" #include <linux/mm.h>
#include "asm/page.h" #include <asm/page.h>
#include "asm/mman.h" #include <asm/mman.h>
const char *arch_vma_name(struct vm_area_struct *vma) const char *arch_vma_name(struct vm_area_struct *vma)
{ {
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#ifdef __i386__ #ifdef __i386__
#include <sys/user.h> #include <sys/user.h>
#endif #endif
#include "longjmp.h" #include <longjmp.h>
#include "sysdep/ptrace_user.h" #include <sysdep/ptrace_user.h>
int save_fp_registers(int pid, unsigned long *fp_regs) int save_fp_registers(int pid, unsigned long *fp_regs)
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "longjmp.h" #include <longjmp.h>
#ifdef __i386__ #ifdef __i386__
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <unistd.h> #include <unistd.h>
#include "sysdep/tls.h" #include <sysdep/tls.h>
#ifndef PTRACE_GET_THREAD_AREA #ifndef PTRACE_GET_THREAD_AREA
#define PTRACE_GET_THREAD_AREA 25 #define PTRACE_GET_THREAD_AREA 25
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/mm.h" #include <linux/mm.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "asm/uaccess.h" #include <asm/uaccess.h>
#include "skas.h" #include <skas.h>
extern int arch_switch_tls(struct task_struct *to); extern int arch_switch_tls(struct task_struct *to);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
#include <errno.h> #include <errno.h>
#include "ptrace_user.h" #include <ptrace_user.h>
int ptrace_getregs(long pid, unsigned long *regs_out) int ptrace_getregs(long pid, unsigned long *regs_out)
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __SYSDEP_X86_PTRACE_H #define __SYSDEP_X86_PTRACE_H
#include <generated/user_constants.h> #include <generated/user_constants.h>
#include "sysdep/faultinfo.h" #include <sysdep/faultinfo.h>
#define MAX_REG_OFFSET (UM_FRAME_SIZE) #define MAX_REG_OFFSET (UM_FRAME_SIZE)
#define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long)) #define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long))
......
#include <asm/unistd.h> #include <asm/unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <signal.h> #include <signal.h>
#include "as-layout.h" #include <as-layout.h>
#include "stub-data.h" #include <stub-data.h>
#ifdef __i386__ #ifdef __i386__
#include "stub_32.h" #include "stub_32.h"
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "asm/unistd.h" #include <asm/unistd.h>
#include "sysdep/ptrace.h" #include <sysdep/ptrace.h>
typedef long syscall_handler_t(struct pt_regs); typedef long syscall_handler_t(struct pt_regs);
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include "frame_kern.h" #include <frame_kern.h>
#include "skas.h" #include <skas.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
......
#include "as-layout.h" #include <as-layout.h>
.globl syscall_stub .globl syscall_stub
.section .__syscall_stub, "ax" .section .__syscall_stub, "ax"
......
#include "as-layout.h" #include <as-layout.h>
.globl syscall_stub .globl syscall_stub
.section .__syscall_stub, "ax" .section .__syscall_stub, "ax"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "sysdep/stub.h" #include <sysdep/stub.h>
#include "sysdep/faultinfo.h" #include <sysdep/faultinfo.h>
#include "sysdep/mcontext.h" #include <sysdep/mcontext.h>
void __attribute__ ((__section__ (".__syscall_stub"))) void __attribute__ ((__section__ (".__syscall_stub")))
stub_segv_handler(int sig, siginfo_t *info, void *p) stub_segv_handler(int sig, siginfo_t *info, void *p)
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/percpu.h" #include <linux/percpu.h>
#include "linux/sched.h" #include <linux/sched.h>
#include "asm/uaccess.h" #include <asm/uaccess.h>
#include "os.h" #include <os.h>
#include "skas.h" #include <skas.h>
#include "sysdep/tls.h" #include <sysdep/tls.h>
/* /*
* If needed we can detect when it's uninitialized. * If needed we can detect when it's uninitialized.
......
#include "linux/sched.h" #include <linux/sched.h>
void clear_flushed_tls(struct task_struct *task) void clear_flushed_tls(struct task_struct *task)
{ {
......
#ifndef __UM_FS_HOSTFS #ifndef __UM_FS_HOSTFS
#define __UM_FS_HOSTFS #define __UM_FS_HOSTFS
#include "os.h" #include <os.h>
/* /*
* These are exactly the same definitions as in fs.h, but the names are * These are exactly the same definitions as in fs.h, but the names are
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/namei.h> #include <linux/namei.h>
#include "hostfs.h" #include "hostfs.h"
#include "init.h" #include <init.h>
#include "kern.h" #include <kern.h>
struct hostfs_inode_info { struct hostfs_inode_info {
int fd; int fd;
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#include "hostfs.h" #include "hostfs.h"
#include "os.h"
#include <utime.h> #include <utime.h>
static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/pid_namespace.h> #include <linux/pid_namespace.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "os.h" #include <os.h>
static struct inode *get_inode(struct super_block *, struct dentry *); static struct inode *get_inode(struct super_block *, struct dentry *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment