Browse Source

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
master
Al Viro 9 years ago
committed by Richard Weinberger
parent
commit
37185b3324
  1. 4
      arch/um/drivers/chan_kern.c
  2. 4
      arch/um/drivers/chan_user.c
  3. 2
      arch/um/drivers/chan_user.h
  4. 6
      arch/um/drivers/cow_sys.h
  5. 2
      arch/um/drivers/daemon.h
  6. 4
      arch/um/drivers/daemon_kern.c
  7. 6
      arch/um/drivers/daemon_user.c
  8. 4
      arch/um/drivers/fd.c
  9. 2
      arch/um/drivers/harddog_user.c
  10. 18
      arch/um/drivers/hostaudio_kern.c
  11. 16
      arch/um/drivers/line.c
  12. 12
      arch/um/drivers/line.h
  13. 2
      arch/um/drivers/mconsole.h
  14. 10
      arch/um/drivers/mconsole_kern.c
  15. 2
      arch/um/drivers/mconsole_kern.h
  16. 2
      arch/um/drivers/mmapper_kern.c
  17. 10
      arch/um/drivers/net_kern.c
  18. 6
      arch/um/drivers/net_user.c
  19. 2
      arch/um/drivers/null.c
  20. 4
      arch/um/drivers/pcap_kern.c
  21. 4
      arch/um/drivers/pcap_user.c
  22. 2
      arch/um/drivers/pcap_user.h
  23. 20
      arch/um/drivers/port_kern.c
  24. 4
      arch/um/drivers/port_user.c
  25. 4
      arch/um/drivers/pty.c
  26. 4
      arch/um/drivers/random.c
  27. 2
      arch/um/drivers/slip_common.c
  28. 2
      arch/um/drivers/slip_kern.c
  29. 6
      arch/um/drivers/slip_user.c
  30. 6
      arch/um/drivers/slirp_kern.c
  31. 4
      arch/um/drivers/slirp_user.c
  32. 22
      arch/um/drivers/ssl.c
  33. 36
      arch/um/drivers/stdio_console.c
  34. 4
      arch/um/drivers/tty.c
  35. 8
      arch/um/drivers/ubd_kern.c
  36. 2
      arch/um/drivers/ubd_user.c
  37. 2
      arch/um/drivers/umcast.h
  38. 4
      arch/um/drivers/umcast_kern.c
  39. 4
      arch/um/drivers/umcast_user.c
  40. 6
      arch/um/drivers/vde_kern.c
  41. 4
      arch/um/drivers/vde_user.c
  42. 4
      arch/um/drivers/xterm.c
  43. 4
      arch/um/drivers/xterm_kern.c
  44. 2
      arch/um/include/asm/dma.h
  45. 2
      arch/um/include/asm/mmu.h
  46. 2
      arch/um/include/asm/page.h
  47. 4
      arch/um/include/asm/pgtable.h
  48. 6
      arch/um/include/asm/processor-generic.h
  49. 2
      arch/um/include/asm/ptrace-generic.h
  50. 6
      arch/um/include/asm/smp.h
  51. 2
      arch/um/include/shared/arch.h
  52. 2
      arch/um/include/shared/as-layout.h
  53. 4
      arch/um/include/shared/irq_kern.h
  54. 2
      arch/um/include/shared/irq_user.h
  55. 4
      arch/um/include/shared/kern_util.h
  56. 4
      arch/um/include/shared/longjmp.h
  57. 6
      arch/um/include/shared/os.h
  58. 4
      arch/um/include/shared/registers.h
  59. 2
      arch/um/include/shared/skas/skas.h
  60. 2
      arch/um/include/shared/skas_ptrace.h
  61. 2
      arch/um/kernel/asm-offsets.c
  62. 2
      arch/um/kernel/config.c.in
  63. 2
      arch/um/kernel/dyn.lds.S
  64. 2
      arch/um/kernel/early_printk.c
  65. 8
      arch/um/kernel/exec.c
  66. 2
      arch/um/kernel/gmon_syms.c
  67. 2
      arch/um/kernel/gprof_syms.c
  68. 12
      arch/um/kernel/initrd.c
  69. 22
      arch/um/kernel/irq.c
  70. 2
      arch/um/kernel/ksyms.c
  71. 12
      arch/um/kernel/mem.c
  72. 8
      arch/um/kernel/process.c
  73. 14
      arch/um/kernel/reboot.c
  74. 6
      arch/um/kernel/sigio.c
  75. 4
      arch/um/kernel/signal.c
  76. 8
      arch/um/kernel/skas/clone.c
  77. 16
      arch/um/kernel/skas/mmu.c
  78. 12
      arch/um/kernel/skas/process.c
  79. 10
      arch/um/kernel/skas/syscall.c
  80. 4
      arch/um/kernel/skas/uaccess.c
  81. 30
      arch/um/kernel/smp.c
  82. 20
      arch/um/kernel/syscall.c
  83. 4
      arch/um/kernel/time.c
  84. 8
      arch/um/kernel/tlb.c
  85. 10
      arch/um/kernel/trap.c
  86. 14
      arch/um/kernel/um_arch.c
  87. 6
      arch/um/kernel/umid.c
  88. 2
      arch/um/kernel/uml.lds.S
  89. 8
      arch/um/os-Linux/aio.c
  90. 2
      arch/um/os-Linux/drivers/etap.h
  91. 2
      arch/um/os-Linux/drivers/ethertap_kern.c
  92. 6
      arch/um/os-Linux/drivers/ethertap_user.c
  93. 2
      arch/um/os-Linux/drivers/tuntap.h
  94. 2
      arch/um/os-Linux/drivers/tuntap_kern.c
  95. 4
      arch/um/os-Linux/drivers/tuntap_user.c
  96. 6
      arch/um/os-Linux/elf_aux.c
  97. 4
      arch/um/os-Linux/execvp.c
  98. 2
      arch/um/os-Linux/file.c
  99. 6
      arch/um/os-Linux/helper.c
  100. 6
      arch/um/os-Linux/irq.c

4
arch/um/drivers/chan_kern.c

@ -7,8 +7,8 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include "chan.h"
#include "os.h"
#include "irq_kern.h"
#include <os.h>
#include <irq_kern.h>
#ifdef CONFIG_NOCONFIG_CHAN
static void *not_configged_init(char *str, int device,

4
arch/um/drivers/chan_user.c

@ -11,8 +11,8 @@
#include <termios.h>
#include <sys/ioctl.h>
#include "chan_user.h"
#include "os.h"
#include "um_malloc.h"
#include <os.h>
#include <um_malloc.h>
void generic_close(int fd, void *unused)
{

2
arch/um/drivers/chan_user.h

@ -6,7 +6,7 @@
#ifndef __CHAN_USER_H__
#define __CHAN_USER_H__
#include "init.h"
#include <init.h>
struct chan_opts {
void (*const announce)(char *dev_name, int dev);

6
arch/um/drivers/cow_sys.h

@ -1,9 +1,9 @@
#ifndef __COW_SYS_H__
#define __COW_SYS_H__
#include "kern_util.h"
#include "os.h"
#include "um_malloc.h"
#include <kern_util.h>
#include <os.h>
#include <um_malloc.h>
static inline void *cow_malloc(int size)
{

2
arch/um/drivers/daemon.h

@ -6,7 +6,7 @@
#ifndef __DAEMON_H__
#define __DAEMON_H__
#include "net_user.h"
#include <net_user.h>
#define SWITCH_VERSION 3

4
arch/um/drivers/daemon_kern.c

@ -6,9 +6,9 @@
* Licensed under the GPL.
*/
#include "linux/init.h"
#include <linux/init.h>
#include <linux/netdevice.h>
#include "net_kern.h"
#include <net_kern.h>
#include "daemon.h"
struct daemon_init {

6
arch/um/drivers/daemon_user.c

@ -14,9 +14,9 @@
#include <sys/time.h>
#include <sys/un.h>
#include "daemon.h"
#include "net_user.h"
#include "os.h"
#include "um_malloc.h"
#include <net_user.h>
#include <os.h>
#include <um_malloc.h>
enum request_type { REQ_NEW_CONTROL };

4
arch/um/drivers/fd.c

@ -9,8 +9,8 @@
#include <errno.h>
#include <termios.h>
#include "chan_user.h"
#include "os.h"
#include "um_malloc.h"
#include <os.h>
#include <um_malloc.h>
struct fd_chan {
int fd;

2
arch/um/drivers/harddog_user.c

@ -6,7 +6,7 @@
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include "os.h"
#include <os.h>
struct dog_data {
int stdin;

18
arch/um/drivers/hostaudio_kern.c

@ -3,15 +3,15 @@
* Licensed under the GPL
*/
#include "linux/fs.h"
#include "linux/module.h"
#include "linux/slab.h"
#include "linux/sound.h"
#include "linux/soundcard.h"
#include "linux/mutex.h"
#include "asm/uaccess.h"
#include "init.h"
#include "os.h"
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/sound.h>
#include <linux/soundcard.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
#include <init.h>
#include <os.h>
struct hostaudio_state {
int fd;

16
arch/um/drivers/line.c

@ -3,15 +3,15 @@
* Licensed under the GPL
*/
#include "linux/irqreturn.h"
#include "linux/kd.h"
#include "linux/sched.h"
#include "linux/slab.h"
#include <linux/irqreturn.h>
#include <linux/kd.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include "chan.h"
#include "irq_kern.h"
#include "irq_user.h"
#include "kern_util.h"
#include "os.h"
#include <irq_kern.h>
#include <irq_user.h>
#include <kern_util.h>
#include <os.h>
#define LINE_BUFSIZE 4096

12
arch/um/drivers/line.h

@ -6,12 +6,12 @@
#ifndef __LINE_H__
#define __LINE_H__
#include "linux/list.h"
#include "linux/workqueue.h"
#include "linux/tty.h"
#include "linux/interrupt.h"
#include "linux/spinlock.h"
#include "linux/mutex.h"
#include <linux/list.h>
#include <linux/workqueue.h>
#include <linux/tty.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include "chan_user.h"
#include "mconsole_kern.h"

2
arch/um/drivers/mconsole.h

@ -12,7 +12,7 @@
#define u32 uint32_t
#endif
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
#define MCONSOLE_MAGIC (0xcafebabe)
#define MCONSOLE_MAX_DATA (512)

10
arch/um/drivers/mconsole_kern.c

@ -24,13 +24,13 @@
#include <asm/uaccess.h>
#include <asm/switch_to.h>
#include "init.h"
#include "irq_kern.h"
#include "irq_user.h"
#include "kern_util.h"
#include <init.h>
#include <irq_kern.h>
#include <irq_user.h>
#include <kern_util.h>
#include "mconsole.h"
#include "mconsole_kern.h"
#include "os.h"
#include <os.h>
static int do_unlink_socket(struct notifier_block *notifier,
unsigned long what, void *data)

2
arch/um/drivers/mconsole_kern.h

@ -6,7 +6,7 @@
#ifndef __MCONSOLE_KERN_H__
#define __MCONSOLE_KERN_H__
#include "linux/list.h"
#include <linux/list.h>
#include "mconsole.h"
struct mconsole_entry {

2
arch/um/drivers/mmapper_kern.c

@ -18,7 +18,7 @@
#include <linux/mm.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 */
static unsigned long mmapper_size;

10
arch/um/drivers/net_kern.c

@ -18,12 +18,12 @@
#include <linux/skbuff.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include "init.h"
#include "irq_kern.h"
#include "irq_user.h"
#include <init.h>
#include <irq_kern.h>
#include <irq_user.h>
#include "mconsole_kern.h"
#include "net_kern.h"
#include "net_user.h"
#include <net_kern.h>
#include <net_user.h>
#define DRIVER_NAME "uml-netdev"

6
arch/um/drivers/net_user.c

@ -11,9 +11,9 @@
#include <string.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include "net_user.h"
#include "os.h"
#include "um_malloc.h"
#include <net_user.h>
#include <os.h>
#include <um_malloc.h>
int tap_open_common(void *dev, char *gate_addr)
{

2
arch/um/drivers/null.c

@ -7,7 +7,7 @@
#include <errno.h>
#include <fcntl.h>
#include "chan_user.h"
#include "os.h"
#include <os.h>
/* This address is used only as a unique identifier */
static int null_chan;

4
arch/um/drivers/pcap_kern.c

@ -3,9 +3,9 @@
* Licensed under the GPL.
*/
#include "linux/init.h"
#include <linux/init.h>
#include <linux/netdevice.h>
#include "net_kern.h"
#include <net_kern.h>
#include "pcap_user.h"
struct pcap_init {

4
arch/um/drivers/pcap_user.c

@ -7,9 +7,9 @@
#include <pcap.h>
#include <string.h>
#include <asm/types.h>
#include "net_user.h"
#include <net_user.h>
#include "pcap_user.h"
#include "um_malloc.h"
#include <um_malloc.h>
#define PCAP_FD(p) (*(int *)(p))

2
arch/um/drivers/pcap_user.h

@ -3,7 +3,7 @@
* Licensed under the GPL
*/
#include "net_user.h"
#include <net_user.h>
struct pcap_data {
char *host_if;

20
arch/um/drivers/port_kern.c

@ -3,16 +3,16 @@
* Licensed under the GPL
*/
#include "linux/completion.h"
#include "linux/interrupt.h"
#include "linux/list.h"
#include "linux/mutex.h"
#include "linux/slab.h"
#include "linux/workqueue.h"
#include "asm/atomic.h"
#include "init.h"
#include "irq_kern.h"
#include "os.h"
#include <linux/completion.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <asm/atomic.h>
#include <init.h>
#include <irq_kern.h>
#include <os.h>
#include "port.h"
struct port_list {

4
arch/um/drivers/port_user.c

@ -10,9 +10,9 @@
#include <unistd.h>
#include <netinet/in.h>
#include "chan_user.h"
#include "os.h"
#include <os.h>
#include "port.h"
#include "um_malloc.h"
#include <um_malloc.h>
struct port_chan {
int raw;

4
arch/um/drivers/pty.c

@ -12,8 +12,8 @@
#include <termios.h>
#include <sys/stat.h>
#include "chan_user.h"
#include "os.h"
#include "um_malloc.h"
#include <os.h>
#include <um_malloc.h>
struct pty_chan {
void (*announce)(char *dev_name, int dev);

4
arch/um/drivers/random.c

@ -13,8 +13,8 @@
#include <linux/miscdevice.h>
#include <linux/delay.h>
#include <asm/uaccess.h>
#include "irq_kern.h"
#include "os.h"
#include <irq_kern.h>
#include <os.h>
/*
* core module and version information

2
arch/um/drivers/slip_common.c

@ -1,6 +1,6 @@
#include <string.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)
{

2
arch/um/drivers/slip_kern.c

@ -6,7 +6,7 @@
#include <linux/if_arp.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include "net_kern.h"
#include <net_kern.h>
#include "slip.h"
struct slip_init {

6
arch/um/drivers/slip_user.c

@ -11,10 +11,10 @@
#include <string.h>
#include <sys/termios.h>
#include <sys/wait.h>
#include "net_user.h"
#include "os.h"
#include <net_user.h>
#include <os.h>
#include "slip.h"
#include "um_malloc.h"
#include <um_malloc.h>
static int slip_user_init(void *data, void *dev)
{

6
arch/um/drivers/slirp_kern.c

@ -4,11 +4,11 @@
*/
#include <linux/if_arp.h>
#include "linux/init.h"
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/string.h>
#include "net_kern.h"
#include "net_user.h"
#include <net_kern.h>
#include <net_user.h>
#include "slirp.h"
struct slirp_init {

4
arch/um/drivers/slirp_user.c

@ -7,8 +7,8 @@
#include <errno.h>
#include <string.h>
#include <sys/wait.h>
#include "net_user.h"
#include "os.h"
#include <net_user.h>
#include <os.h>
#include "slirp.h"
static int slirp_user_init(void *data, void *dev)

22
arch/um/drivers/ssl.c

@ -3,19 +3,19 @@
* Licensed under the GPL
*/
#include "linux/fs.h"
#include "linux/tty.h"
#include "linux/tty_driver.h"
#include "linux/major.h"
#include "linux/mm.h"
#include "linux/init.h"
#include "linux/console.h"
#include "asm/termbits.h"
#include "asm/irq.h"
#include <linux/fs.h>
#include <linux/tty.h>
#include <linux/tty_driver.h>
#include <linux/major.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/console.h>
#include <asm/termbits.h>
#include <asm/irq.h>
#include "ssl.h"
#include "chan.h"
#include "init.h"
#include "irq_user.h"
#include <init.h>
#include <irq_user.h>
#include "mconsole_kern.h"
static const int ssl_version = 1;

36
arch/um/drivers/stdio_console.c

@ -3,27 +3,27 @@
* Licensed under the GPL
*/
#include "linux/posix_types.h"
#include "linux/tty.h"
#include "linux/tty_flip.h"
#include "linux/types.h"
#include "linux/major.h"
#include "linux/kdev_t.h"
#include "linux/console.h"
#include "linux/string.h"
#include "linux/sched.h"
#include "linux/list.h"
#include "linux/init.h"
#include "linux/interrupt.h"
#include "linux/slab.h"
#include "linux/hardirq.h"
#include "asm/current.h"
#include "asm/irq.h"
#include <linux/posix_types.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/types.h>
#include <linux/major.h>
#include <linux/kdev_t.h>
#include <linux/console.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/list.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/hardirq.h>
#include <asm/current.h>
#include <asm/irq.h>
#include "stdio_console.h"
#include "chan.h"
#include "irq_user.h"
#include <irq_user.h>
#include "mconsole_kern.h"
#include "init.h"
#include <init.h>
#define MAX_TTYS (16)

4
arch/um/drivers/tty.c

@ -7,8 +7,8 @@
#include <fcntl.h>
#include <termios.h>
#include "chan_user.h"
#include "os.h"
#include "um_malloc.h"
#include <os.h>
#include <um_malloc.h>
struct tty_chan {
char *dev;

8
arch/um/drivers/ubd_kern.c

@ -33,12 +33,12 @@
#include <linux/platform_device.h>
#include <linux/scatterlist.h>
#include <asm/tlbflush.h>
#include "kern_util.h"
#include <kern_util.h>
#include "mconsole_kern.h"
#include "init.h"
#include "irq_kern.h"
#include <init.h>
#include <irq_kern.h>
#include "ubd.h"
#include "os.h"
#include <os.h>
#include "cow.h"
enum ubd_req { UBD_READ, UBD_WRITE };

2
arch/um/drivers/ubd_user.c

@ -19,7 +19,7 @@
#include <byteswap.h>
#include "ubd.h"
#include "os.h"
#include <os.h>
void ignore_sigwinch_sig(void)
{

2
arch/um/drivers/umcast.h

@ -6,7 +6,7 @@
#ifndef __DRIVERS_UMCAST_H
#define __DRIVERS_UMCAST_H
#include "net_user.h"
#include <net_user.h>
struct umcast_data {
char *addr;

4
arch/um/drivers/umcast_kern.c

@ -11,10 +11,10 @@
* Licensed under the GPL.
*/
#include "linux/init.h"
#include <linux/init.h>
#include <linux/netdevice.h>
#include "umcast.h"
#include "net_kern.h"
#include <net_kern.h>
struct umcast_init {
char *addr;

4
arch/um/drivers/umcast_user.c

@ -16,8 +16,8 @@
#include <errno.h>
#include <netinet/in.h>
#include "umcast.h"
#include "net_user.h"
#include "um_malloc.h"
#include <net_user.h>
#include <um_malloc.h>
static struct sockaddr_in *new_addr(char *addr, unsigned short port)
{

6
arch/um/drivers/vde_kern.c

@ -7,10 +7,10 @@
*
*/
#include "linux/init.h"
#include <linux/init.h>
#include <linux/netdevice.h>
#include "net_kern.h"
#include "net_user.h"
#include <net_kern.h>
#include <net_user.h>
#include "vde.h"
static void vde_init(struct net_device *dev, void *data)

4
arch/um/drivers/vde_user.c

@ -6,8 +6,8 @@
#include <stddef.h>
#include <errno.h>
#include <libvdeplug.h>
#include "net_user.h"
#include "um_malloc.h"
#include <net_user.h>
#include <um_malloc.h>
#include "vde.h"
static int vde_user_init(void *data, void *dev)

4
arch/um/drivers/xterm.c

@ -11,8 +11,8 @@
#include <string.h>
#include <termios.h>
#include "chan_user.h"
#include "os.h"
#include "um_malloc.h"
#include <os.h>
#include <um_malloc.h>
#include "xterm.h"
struct xterm_chan {

4
arch/um/drivers/xterm_kern.c

@ -7,8 +7,8 @@
#include <linux/completion.h>
#include <linux/irqreturn.h>
#include <asm/irq.h>
#include "irq_kern.h"
#include "os.h"
#include <irq_kern.h>
#include <os.h>
struct xterm_wait {
struct completion ready;

2
arch/um/include/asm/dma.h

@ -1,7 +1,7 @@
#ifndef __UM_DMA_H
#define __UM_DMA_H
#include "asm/io.h"
#include <asm/io.h>
extern unsigned long uml_physmem;

2
arch/um/include/asm/mmu.h

@ -6,7 +6,7 @@
#ifndef __ARCH_UM_MMU_H
#define __ARCH_UM_MMU_H
#include "mm_id.h"
#include <mm_id.h>
#include <asm/mm_context.h>
typedef struct mm_context {

2
arch/um/include/asm/page.h

@ -99,7 +99,7 @@ extern unsigned long uml_physmem;
#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
* mmap_kmem about cutting a long long down to a void *. Not sure that

4
arch/um/include/asm/pgtable.h

@ -23,9 +23,9 @@
pte_present gives true */
#ifdef CONFIG_3_LEVEL_PGTABLES
#include "asm/pgtable-3level.h"
#include <asm/pgtable-3level.h>
#else
#include "asm/pgtable-2level.h"
#include <asm/pgtable-2level.h>
#endif
extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

6
arch/um/include/asm/processor-generic.h

@ -10,9 +10,9 @@ struct pt_regs;
struct task_struct;
#include "asm/ptrace.h"
#include "registers.h"
#include "sysdep/archsetjmp.h"
#include <asm/ptrace.h>
#include <registers.h>
#include <sysdep/archsetjmp.h>
#include <linux/prefetch.h>

2
arch/um/include/asm/ptrace-generic.h

@ -9,7 +9,7 @@
#ifndef __ASSEMBLY__
#include <asm/ptrace-abi.h>
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
struct pt_regs {
struct uml_pt_regs regs;

6
arch/um/include/asm/smp.h

@ -3,9 +3,9 @@
#ifdef CONFIG_SMP
#include "linux/bitops.h"
#include "asm/current.h"
#include "linux/cpumask.h"
#include <linux/bitops.h>
#include <asm/current.h>
#include <linux/cpumask.h>
#define raw_smp_processor_id() (current_thread->cpu)

2
arch/um/include/shared/arch.h

@ -6,7 +6,7 @@
#ifndef __ARCH_H__
#define __ARCH_H__
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
extern void arch_check_bugs(void);
extern int arch_fixup(unsigned long address, struct uml_pt_regs *regs);

2
arch/um/include/shared/as-layout.h

@ -35,7 +35,7 @@
#ifndef __ASSEMBLY__
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
struct cpu_task {
int pid;

4
arch/um/include/shared/irq_kern.h

@ -6,8 +6,8 @@
#ifndef __IRQ_KERN_H__
#define __IRQ_KERN_H__
#include "linux/interrupt.h"
#include "asm/ptrace.h"
#include <linux/interrupt.h>
#include <asm/ptrace.h>
extern int um_request_irq(unsigned int irq, int fd, int type,
irq_handler_t handler,

2
arch/um/include/shared/irq_user.h

@ -6,7 +6,7 @@
#ifndef __IRQ_USER_H__
#define __IRQ_USER_H__
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
struct irq_fd {
struct irq_fd *next;

4
arch/um/include/shared/kern_util.h

@ -6,8 +6,8 @@
#ifndef __KERN_UTIL_H__
#define __KERN_UTIL_H__
#include "sysdep/ptrace.h"
#include "sysdep/faultinfo.h"
#include <sysdep/ptrace.h>
#include <sysdep/faultinfo.h>
struct siginfo;

4
arch/um/include/shared/longjmp.h

@ -1,8 +1,8 @@
#ifndef __UML_LONGJMP_H
#define __UML_LONGJMP_H
#include "sysdep/archsetjmp.h"
#include "os.h"
#include <sysdep/archsetjmp.h>
#include <os.h>
extern int setjmp(jmp_buf);
extern void longjmp(jmp_buf, int);

6
arch/um/include/shared/os.h

@ -7,9 +7,9 @@
#define __OS_H__
#include <stdarg.h>
#include "irq_user.h"
#include "longjmp.h"
#include "mm_id.h"
#include <irq_user.h>
#include <longjmp.h>
#include <mm_id.h>
#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))

4
arch/um/include/shared/registers.h

@ -6,8 +6,8 @@
#ifndef __REGISTERS_H
#define __REGISTERS_H
#include "sysdep/ptrace.h"
#include "sysdep/archsetjmp.h"
#include <sysdep/ptrace.h>
#include <sysdep/archsetjmp.h>
extern int save_fp_registers(int pid, unsigned long *fp_regs);
extern int restore_fp_registers(int pid, unsigned long *fp_regs);

2
arch/um/include/shared/skas/skas.h

@ -6,7 +6,7 @@
#ifndef __SKAS_H
#define __SKAS_H
#include "sysdep/ptrace.h"
#include <sysdep/ptrace.h>
extern int userspace_pid[];
extern int proc_mm, ptrace_faultinfo, ptrace_ldt;

2
arch/um/include/shared/skas_ptrace.h

@ -9,6 +9,6 @@
#define PTRACE_FAULTINFO 52
#define PTRACE_SWITCH_MM 55
#include "sysdep/skas_ptrace.h"
#include <sysdep/skas_ptrace.h>
#endif

2
arch/um/kernel/asm-offsets.c

@ -1 +1 @@
#include "sysdep/kernel-offsets.h"
#include <sysdep/kernel-offsets.h>

2
arch/um/kernel/config.c.in

@ -5,7 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "init.h"
#include <init.h>
static __initdata const char *config[] = {
"CONFIG"

2
arch/um/kernel/dyn.lds.S

@ -89,7 +89,7 @@ SECTIONS
.kstrtab : { *(.kstrtab) }
#include "asm/common.lds.S"
#include <asm/common.lds.S>
init.data : { INIT_DATA }

2
arch/um/kernel/early_printk.c

@ -9,7 +9,7 @@
#include <linux/kernel.h>
#include <linux/console.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)
{

8
arch/um/kernel/exec.c

@ -12,10 +12,10 @@
#include <asm/current.h>
#include <asm/processor.h>
#include <asm/uaccess.h>
#include "as-layout.h"
#include "mem_user.h"
#include "skas.h"
#include "os.h"
#include <as-layout.h>
#include <mem_user.h>
#include <skas.h>
#include <os.h>
#include "internal.h"
void flush_thread(void)

2
arch/um/kernel/gmon_syms.c

@ -3,7 +3,7 @@
* Licensed under the GPL
*/
#include "linux/module.h"
#include <linux/module.h>
extern void __bb_init_func(void *) __attribute__((weak));
EXPORT_SYMBOL(__bb_init_func);

2
arch/um/kernel/gprof_syms.c

@ -3,7 +3,7 @@
* Licensed under the GPL
*/
#include "linux/module.h"
#include <linux/module.h>
extern void mcount(void);
EXPORT_SYMBOL(mcount);

12
arch/um/kernel/initrd.c

@ -3,12 +3,12 @@
* Licensed under the GPL
*/
#include "linux/init.h"
#include "linux/bootmem.h"
#include "linux/initrd.h"
#include "asm/types.h"
#include "init.h"
#include "os.h"
#include <linux/init.h>
#include <linux/bootmem.h>
#include <linux/initrd.h>
#include <asm/types.h>
#include <init.h>
#include <os.h>
/* Changed by uml_initrd_setup, which is a setup */
static char *initrd __initdata = NULL;

22
arch/um/kernel/irq.c

@ -5,17 +5,17 @@
* Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
*/
#include "linux/cpumask.h"
#include "linux/hardirq.h"
#include "linux/interrupt.h"
#include "linux/kernel_stat.h"
#include "linux/module.h"
#include "linux/sched.h"
#include "linux/seq_file.h"
#include "linux/slab.h"
#include "as-layout.h"
#include "kern_util.h"
#include "os.h"
#include <linux/cpumask.h>
#include <linux/hardirq.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <as-layout.h>
#include <kern_util.h>
#include <os.h>
/*
* This list is accessed under irq_lock, except in sigio_handler,

2
arch/um/kernel/ksyms.c

@ -4,7 +4,7 @@
*/
#include <linux/module.h>
#include "os.h"
#include <os.h>
EXPORT_SYMBOL(set_signals);
EXPORT_SYMBOL(get_signals);

12
arch/um/kernel/mem.c

@ -12,12 +12,12 @@
#include <linux/slab.h>
#include <asm/fixmap.h>
#include <asm/page.h>
#include "as-layout.h"
#include "init.h"
#include "kern.h"
#include "kern_util.h"
#include "mem_user.h"
#include "os.h"
#include <as-layout.h>
#include <init.h>
#include <kern.h>
#include <kern_util.h>
#include <mem_user.h>
#include <os.h>
/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
unsigned long *empty_zero_page = NULL;

8
arch/um/kernel/process.c

@ -23,10 +23,10 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/uaccess.h>
#include "as-layout.h"
#include "kern_util.h"
#include "os.h"
#include "skas.h"
#include <as-layout.h>
#include <kern_util.h>
#include <os.h>
#include <skas.h>
/*
* This is a per-cpu array. A processor only modifies its entry and it only

14
arch/um/kernel/reboot.c

@ -3,13 +3,13 @@
* Licensed under the GPL
*/
#include "linux/sched.h"
#include "linux/spinlock.h"
#include "linux/slab.h"
#include "linux/oom.h"
#include "kern_util.h"
#include "os.h"
#include "skas.h"
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/oom.h>
#include <kern_util.h>
#include <os.h>
#include <skas.h>
void (*pm_power_off)(void);

6
arch/um/kernel/sigio.c

@ -4,9 +4,9 @@
*/
#include <linux/interrupt.h>
#include "irq_kern.h"
#include "os.h"
#include "sigio.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;

4
arch/um/kernel/signal.c

@ -9,8 +9,8 @@
#include <asm/siginfo.h>
#include <asm/signal.h>
#include <asm/unistd.h>
#include "frame_kern.h"
#include "kern_util.h"
#include <frame_kern.h>
#include <kern_util.h>
EXPORT_SYMBOL(block_signals);
EXPORT_SYMBOL(unblock_signals);

8
arch/um/kernel/skas/clone.c

@ -7,10 +7,10 @@
#include <sched.h>
#include <asm/unistd.h>
#include <sys/time.h>
#include "as-layout.h"
#include "ptrace_user.h"
#include "stub-data.h"
#include "sysdep/stub.h"
#include <as-layout.h>
#include <ptrace_user.h>
#include <stub-data.h>
#include <sysdep/stub.h>
/*
* This is in a separate file because it needs to be compiled with any

16
arch/um/kernel/skas/mmu.c

@ -3,14 +3,14 @@
* Licensed under the GPL
*/
#include "linux/mm.h"
#include "linux/sched.h"
#include "linux/slab.h"
#include "asm/pgalloc.h"
#include "asm/pgtable.h"
#include "as-layout.h"
#include "os.h"
#include "skas.h"
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
#include <as-layout.h>
#include <os.h>
#include <skas.h>
extern int __syscall_stub_start;

12
arch/um/kernel/skas/process.c

@ -3,12 +3,12 @@
* Licensed under the GPL
*/
#include "linux/init.h"
#include "linux/sched.h"
#include "as-layout.h"
#include "kern.h"
#include "os.h"
#include "skas.h"
#include <linux/init.h>
#include <linux/sched.h>
#include <as-layout.h>
#include <kern.h>
#include <os.h>
#include <skas.h>
int new_mm(unsigned long stack)
{

10
arch/um/kernel/skas/syscall.c

@ -3,11 +3,11 @@
* Licensed under the GPL
*/
#include "linux/kernel.h"
#include "linux/ptrace.h"
#include "kern_util.h"
#include "sysdep/ptrace.h"
#include "sysdep/syscalls.h"
#include <linux/kernel.h>
#include <linux/ptrace.h>
#include <kern_util.h>
#include <sysdep/ptrace.h>
#include <sysdep/syscalls.h>
extern int syscall_table_size;
#define NR_SYSCALLS (syscall_table_size / sizeof(void *))

4
arch/um/kernel/skas/uaccess.c

@ -11,8 +11,8 @@
#include <asm/current.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include "kern_util.h"
#include "os.h"
#include <kern_util.h>
#include <os.h>
pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
{

30
arch/um/kernel/smp.c

@ -3,24 +3,24 @@
* Licensed under the GPL
*/
#include "linux/percpu.h"
#include "asm/pgalloc.h"
#include "asm/tlb.h"
#include <linux/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlb.h>
#ifdef CONFIG_SMP
#include "linux/sched.h"
#include "linux/module.h"
#include "linux/threads.h"
#include "linux/interrupt.h"
#include "linux/err.h"
#include "linux/hardirq.h"
#include "asm/smp.h"
#include "asm/processor.h"
#include "asm/spinlock.h"
#include "kern.h"
#include "irq_user.h"
#include "os.h"
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/threads.h>
#include <linux/interrupt.h>
#include <linux/err.h>
#include <linux/hardirq.h>
#include <asm/smp.h>
#include <asm/processor.h>
#include <asm/spinlock.h>
#include <kern.h>
#include <irq_user.h>
#include <os.h>
/* Per CPU bogomips and other parameters
* The only piece used here is the ipi pipe, which is set before SMP is

20
arch/um/kernel/syscall.c

@ -3,16 +3,16 @@
* Licensed under the GPL
*/
#include "linux/file.h"
#include "linux/fs.h"
#include "linux/mm.h"
#include "linux/sched.h"
#include "linux/utsname.h"
#include "linux/syscalls.h"
#include "asm/current.h"
#include "asm/mman.h"
#include "asm/uaccess.h"
#include "asm/unistd.h"
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/utsname.h>
#include <linux/syscalls.h>
#include <asm/current.h>
#include <asm/mman.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
#include "internal.h"
long sys_fork(void)

4
arch/um/kernel/time.c

@ -10,8 +10,8 @@
#include <linux/threads.h>
#include <asm/irq.h>
#include <asm/param.h>
#include "kern_util.h"
#include "os.h"
#include <kern_util.h>
#include <os.h>