Commit f59b51fe authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML changes from Richard Weinberger:
 "UML receives this time only cleanups.

  The most outstanding change is the 'include "foo.h"' do 'include
  <foo.h>' conversion done by Al Viro.

  It touches many files, that's why the diffstat is rather big."

* 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  typo in UserModeLinux-HOWTO
  hppfs: fix the return value of get_inode()
  hostfs: drop vmtruncate
  um: get rid of pointless include "..." where include <...> will do
  um: move sysrq.h out of include/shared
  um/x86: merge 32 and 64 bit variants of ptrace.h
  um/x86: merge 32 and 64bit variants of checksum.h
parents aac2b1f5 062d5267
......@@ -3591,7 +3591,7 @@
Looking at the source shows that the fault happened during a call to
copy_to_user to copy the data into the kernel:
copy_from_user to copy the data into the kernel:
107 count -= chars;
......
......@@ -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,
......
......@@ -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)
{
......
......@@ -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);
......
#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)
{
......
......@@ -6,7 +6,7 @@
#ifndef __DAEMON_H__
#define __DAEMON_H__
#include "net_user.h"
#include <net_user.h>
#define SWITCH_VERSION 3
......
......@@ -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 {
......
......@@ -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 };
......
......@@ -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;
......
......@@ -6,7 +6,7 @@
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include "os.h"
#include <os.h>
struct dog_data {
int stdin;
......
......@@ -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;
......
......@@ -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
......
......@@ -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"
......
......@@ -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)
......
......@@ -27,13 +27,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)
......
......@@ -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 {
......
......@@ -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;
......
......@@ -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"
......
......@@ -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)
{
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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))
......
......@@ -3,7 +3,7 @@
* Licensed under the GPL
*/
#include "net_user.h"
#include <net_user.h>
struct pcap_data {
char *host_if;
......
......@@ -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 {
......
......@@ -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;
......
......@@ -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);
......
......@@ -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
......
#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)
{
......
......@@ -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 {
......
......@@ -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)
{
......
......@@ -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 {
......
......@@ -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)
......
......@@ -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;
......
......@@ -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)
......
......@@ -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;
......
......@@ -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 };
......
......@@ -19,7 +19,7 @@
#include <byteswap.h>
#include "ubd.h"
#include "os.h"
#include <os.h>
void ignore_sigwinch_sig(void)
{
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
{
......
......@@ -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)
......
......@@ -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)
......
......@@ -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 {
......
......@@ -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;
......
#ifndef __UM_DMA_H
#define __UM_DMA_H
#include "asm/io.h"
#include <asm/io.h>
extern unsigned long uml_physmem;
......
......@@ -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 {
......
......@@ -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
......
......@@ -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];
......
......@@ -10,9 +10,9 @@ struct pt_regs;
struct task_struct;
#include "asm/ptrace.h"
#include "registers.h"
#include "sysdep/archsetjmp.h"