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

f59b51fe · Linus Torvalds <[email protected]> · 2012-10-10 11:15:20 +09:00

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

Commit: f59b51fe3d3092c08d7d554ecb40db24011b2ebc
Parents: aac2b1f5 · 062d5267

Merge commit. Changes below are compared with the first parent: aac2b1f5.

Changes

155 files changed · +641 −785

File	Status	Add	Del	Content
Documentation/virtual/uml/UserModeLinux-HOWTO.txt	modified	+1	−1	View file
arch/um/drivers/chan_kern.c	modified	+2	−2	View file
arch/um/drivers/chan_user.c	modified	+2	−2	View file
arch/um/drivers/chan_user.h	modified	+1	−1	View file
arch/um/drivers/cow_sys.h	modified	+3	−3	View file
arch/um/drivers/daemon.h	modified	+1	−1	View file
arch/um/drivers/daemon_kern.c	modified	+2	−2	View file
arch/um/drivers/daemon_user.c	modified	+3	−3	View file
arch/um/drivers/fd.c	modified	+2	−2	View file
arch/um/drivers/harddog_user.c	modified	+1	−1	View file
arch/um/drivers/hostaudio_kern.c	modified	+9	−9	View file
arch/um/drivers/line.c	modified	+8	−8	View file
arch/um/drivers/line.h	modified	+6	−6	View file
arch/um/drivers/mconsole.h	modified	+1	−1	View file
arch/um/drivers/mconsole_kern.c	modified	+5	−5	View file
arch/um/drivers/mconsole_kern.h	modified	+1	−1	View file
arch/um/drivers/mmapper_kern.c	modified	+1	−1	View file
arch/um/drivers/net_kern.c	modified	+5	−5	View file
arch/um/drivers/net_user.c	modified	+3	−3	View file
arch/um/drivers/null.c	modified	+1	−1	View file
arch/um/drivers/pcap_kern.c	modified	+2	−2	View file
arch/um/drivers/pcap_user.c	modified	+2	−2	View file
arch/um/drivers/pcap_user.h	modified	+1	−1	View file
arch/um/drivers/port_kern.c	modified	+10	−10	View file
arch/um/drivers/port_user.c	modified	+2	−2	View file
arch/um/drivers/pty.c	modified	+2	−2	View file
arch/um/drivers/random.c	modified	+2	−2	View file
arch/um/drivers/slip_common.c	modified	+1	−1	View file
arch/um/drivers/slip_kern.c	modified	+1	−1	View file
arch/um/drivers/slip_user.c	modified	+3	−3	View file
arch/um/drivers/slirp_kern.c	modified	+3	−3	View file
arch/um/drivers/slirp_user.c	modified	+2	−2	View file
arch/um/drivers/ssl.c	modified	+11	−11	View file
arch/um/drivers/stdio_console.c	modified	+18	−18	View file
arch/um/drivers/tty.c	modified	+2	−2	View file
arch/um/drivers/ubd_kern.c	modified	+4	−4	View file
arch/um/drivers/ubd_user.c	modified	+1	−1	View file
arch/um/drivers/umcast.h	modified	+1	−1	View file
arch/um/drivers/umcast_kern.c	modified	+2	−2	View file
arch/um/drivers/umcast_user.c	modified	+2	−2	View file
arch/um/drivers/vde_kern.c	modified	+3	−3	View file
arch/um/drivers/vde_user.c	modified	+2	−2	View file
arch/um/drivers/xterm.c	modified	+2	−2	View file
arch/um/drivers/xterm_kern.c	modified	+2	−2	View file
arch/um/include/asm/dma.h	modified	+1	−1	View file
arch/um/include/asm/mmu.h	modified	+1	−1	View file
arch/um/include/asm/page.h	modified	+1	−1	View file
arch/um/include/asm/pgtable.h	modified	+2	−2	View file
arch/um/include/asm/processor-generic.h	modified	+3	−3	View file
arch/um/include/asm/ptrace-generic.h	modified	+1	−1	View file
arch/um/include/asm/smp.h	modified	+3	−3	View file
arch/um/include/shared/sysrq.h → arch/um/include/asm/sysrq.h	renamed	+0	−0	View file
arch/um/include/shared/arch.h	modified	+1	−1	View file
arch/um/include/shared/as-layout.h	modified	+1	−1	View file
arch/um/include/shared/irq_kern.h	modified	+2	−2	View file
arch/um/include/shared/irq_user.h	modified	+1	−1	View file
arch/um/include/shared/kern_util.h	modified	+2	−2	View file
arch/um/include/shared/longjmp.h	modified	+2	−2	View file
arch/um/include/shared/os.h	modified	+3	−3	View file
arch/um/include/shared/registers.h	modified	+2	−2	View file
arch/um/include/shared/skas/skas.h	modified	+1	−1	View file
arch/um/include/shared/skas_ptrace.h	modified	+1	−1	View file
arch/um/kernel/asm-offsets.c	modified	+1	−1	View file
arch/um/kernel/config.c.in	modified	+1	−1	View file
arch/um/kernel/dyn.lds.S	modified	+1	−1	View file
arch/um/kernel/early_printk.c	modified	+1	−1	View file
arch/um/kernel/exec.c	modified	+4	−4	View file
arch/um/kernel/gmon_syms.c	modified	+1	−1	View file
arch/um/kernel/gprof_syms.c	modified	+1	−1	View file
arch/um/kernel/initrd.c	modified	+6	−6	View file
arch/um/kernel/irq.c	modified	+11	−11	View file
arch/um/kernel/ksyms.c	modified	+1	−1	View file
arch/um/kernel/mem.c	modified	+6	−6	View file
arch/um/kernel/process.c	modified	+4	−4	View file
arch/um/kernel/reboot.c	modified	+7	−7	View file
arch/um/kernel/sigio.c	modified	+3	−3	View file
arch/um/kernel/signal.c	modified	+2	−2	View file
arch/um/kernel/skas/clone.c	modified	+4	−4	View file
arch/um/kernel/skas/mmu.c	modified	+8	−8	View file
arch/um/kernel/skas/process.c	modified	+6	−6	View file
arch/um/kernel/skas/syscall.c	modified	+5	−5	View file
arch/um/kernel/skas/uaccess.c	modified	+2	−2	View file
arch/um/kernel/smp.c	modified	+15	−15	View file
arch/um/kernel/syscall.c	modified	+10	−10	View file
arch/um/kernel/sysrq.c	modified	+1	−1	View file
arch/um/kernel/time.c	modified	+2	−2	View file
arch/um/kernel/tlb.c	modified	+4	−4	View file
arch/um/kernel/trap.c	modified	+5	−5	View file
arch/um/kernel/um_arch.c	modified	+7	−7	View file
arch/um/kernel/umid.c	modified	+3	−3	View file
arch/um/kernel/uml.lds.S	modified	+1	−1	View file
arch/um/os-Linux/aio.c	modified	+4	−4	View file
arch/um/os-Linux/drivers/etap.h	modified	+1	−1	View file
arch/um/os-Linux/drivers/ethertap_kern.c	modified	+1	−1	View file
arch/um/os-Linux/drivers/ethertap_user.c	modified	+3	−3	View file
arch/um/os-Linux/drivers/tuntap.h	modified	+1	−1	View file
arch/um/os-Linux/drivers/tuntap_kern.c	modified	+1	−1	View file
arch/um/os-Linux/drivers/tuntap_user.c	modified	+2	−2	View file
arch/um/os-Linux/elf_aux.c	modified	+3	−3	View file
arch/um/os-Linux/execvp.c	modified	+2	−2	View file
arch/um/os-Linux/file.c	modified	+1	−1	View file
arch/um/os-Linux/helper.c	modified	+3	−3	View file
arch/um/os-Linux/irq.c	modified	+3	−3	View file
arch/um/os-Linux/main.c	modified	+5	−5	View file
arch/um/os-Linux/mem.c	modified	+2	−2	View file
arch/um/os-Linux/process.c	modified	+4	−4	View file
arch/um/os-Linux/registers.c	modified	+3	−3	View file
arch/um/os-Linux/sigio.c	modified	+5	−5	View file
arch/um/os-Linux/signal.c	modified	+4	−4	View file
arch/um/os-Linux/skas/mem.c	modified	+10	−10	View file
arch/um/os-Linux/skas/process.c	modified	+11	−11	View file
arch/um/os-Linux/start_up.c	modified	+7	−7	View file
arch/um/os-Linux/time.c	modified	+2	−2	View file
arch/um/os-Linux/tty.c	modified	+2	−2	View file
arch/um/os-Linux/umid.c	modified	+2	−2	View file
arch/um/os-Linux/user_syms.c	modified	+2	−2	View file
arch/um/os-Linux/util.c	modified	+1	−1	View file
arch/um/sys-ppc/miscthings.c	modified	+3	−3	View file
arch/um/sys-ppc/ptrace.c	modified	+1	−1	View file
arch/um/sys-ppc/ptrace_user.c	modified	+1	−1	View file
arch/um/sys-ppc/shared/sysdep/ptrace.h	modified	+1	−1	View file
arch/um/sys-ppc/sigcontext.c	modified	+1	−1	View file
arch/um/sys-ppc/sysrq.c	modified	+2	−2	View file
arch/x86/um/asm/checksum.h	modified	+144	−0	View file
arch/x86/um/asm/checksum_32.h	modified	+0	−140	View file
arch/x86/um/asm/checksum_64.h	modified	+0	−125	View file
arch/x86/um/asm/elf.h	modified	+1	−1	View file
arch/x86/um/asm/ptrace.h	modified	+54	−4	View file
arch/x86/um/asm/ptrace_32.h	deleted	+0	−28	View before deletion
arch/x86/um/asm/ptrace_64.h	deleted	+0	−46	View before deletion
arch/x86/um/bugs_32.c	modified	+3	−3	View file
arch/x86/um/bugs_64.c	modified	+1	−1	View file
arch/x86/um/fault.c	modified	+1	−1	View file
arch/x86/um/ldt.c	modified	+5	−5	View file
arch/x86/um/mem_64.c	modified	+3	−3	View file
arch/x86/um/os-Linux/registers.c	modified	+2	−2	View file
arch/x86/um/os-Linux/task_size.c	modified	+1	−1	View file
arch/x86/um/os-Linux/tls.c	modified	+1	−1	View file
arch/x86/um/ptrace_32.c	modified	+4	−4	View file
arch/x86/um/ptrace_user.c	modified	+1	−1	View file
arch/x86/um/shared/sysdep/ptrace.h	modified	+1	−1	View file
arch/x86/um/shared/sysdep/stub.h	modified	+2	−2	View file
arch/x86/um/shared/sysdep/syscalls_32.h	modified	+2	−2	View file
arch/x86/um/signal.c	modified	+2	−2	View file
arch/x86/um/stub_32.S	modified	+1	−1	View file
arch/x86/um/stub_64.S	modified	+1	−1	View file
arch/x86/um/stub_segv.c	modified	+3	−3	View file
arch/x86/um/sysrq_32.c	modified	+6	−6	View file
arch/x86/um/sysrq_64.c	modified	+1	−1	View file
arch/x86/um/tls_32.c	modified	+6	−6	View file
arch/x86/um/tls_64.c	modified	+1	−1	View file
fs/hostfs/hostfs.h	modified	+1	−1	View file
fs/hostfs/hostfs_kern.c	modified	+7	−5	View file
fs/hostfs/hostfs_user.c	modified	+0	−1	View file
fs/hppfs/hppfs.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/virtual/uml/UserModeLinux-HOWTO.txt

View file

diff --git a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
index 77dfecf..a5f8436 100644
--- a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
@@ -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;

arch/um/drivers/chan_kern.c

View file

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 87eebfe..c3bba73 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/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,

arch/um/drivers/chan_user.c

View file

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index f180813..9be670a 100644
--- a/arch/um/drivers/chan_user.c
+++ b/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)
 {

arch/um/drivers/chan_user.h

View file

diff --git a/arch/um/drivers/chan_user.h b/arch/um/drivers/chan_user.h
index 6257b7a..dc69329 100644
--- a/arch/um/drivers/chan_user.h
+++ b/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);

arch/um/drivers/cow_sys.h

View file

diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index 7f2ed0b..67cbee6 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/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)
 {

arch/um/drivers/daemon.h

View file

diff --git a/arch/um/drivers/daemon.h b/arch/um/drivers/daemon.h
index 6e0e891..c2dd195 100644
--- a/arch/um/drivers/daemon.h
+++ b/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
 

arch/um/drivers/daemon_kern.c

View file

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index b4a1522..7568cc2 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/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 {

arch/um/drivers/daemon_user.c

View file

diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index a4fd7bc..8813c10 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/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 };
 

arch/um/drivers/fd.c

View file

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 5b81d25..a13a427 100644
--- a/arch/um/drivers/fd.c
+++ b/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;

arch/um/drivers/harddog_user.c

View file

diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 0345d62..f99b32a 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/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;

arch/um/drivers/hostaudio_kern.c

View file

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index f9f6a4e..9b90fdc 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/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;

arch/um/drivers/line.c

View file

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 457475f..fd9a15b 100644
--- a/arch/um/drivers/line.c
+++ b/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
 

arch/um/drivers/line.h

View file

diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h
index bae9561..138a145 100644
--- a/arch/um/drivers/line.h
+++ b/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"
 

arch/um/drivers/mconsole.h

View file

diff --git a/arch/um/drivers/mconsole.h b/arch/um/drivers/mconsole.h
index c139ae1..8b22535 100644
--- a/arch/um/drivers/mconsole.h
+++ b/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)

arch/um/drivers/mconsole_kern.c

View file

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 9efeb6d..79ccfe6 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -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)

arch/um/drivers/mconsole_kern.h

View file

diff --git a/arch/um/drivers/mconsole_kern.h b/arch/um/drivers/mconsole_kern.h
index d2fe07e..7a0c6a1 100644
--- a/arch/um/drivers/mconsole_kern.h
+++ b/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 {

arch/um/drivers/mmapper_kern.c

View file

diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index c0ef803..62145c2 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/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;

arch/um/drivers/net_kern.c

View file

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 458d324..b1314eb 100644
--- a/arch/um/drivers/net_kern.c
+++ b/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"
 

arch/um/drivers/net_user.c

View file

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 05090c3..cd14157 100644
--- a/arch/um/drivers/net_user.c
+++ b/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)
 {

arch/um/drivers/null.c

View file

diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 2b45a14..1049574 100644
--- a/arch/um/drivers/null.c
+++ b/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;

arch/um/drivers/pcap_kern.c

View file

diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 2860525..be0fb57 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/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 {

arch/um/drivers/pcap_user.c

View file

diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index 702a75b..c07b9c7 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/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))
 

arch/um/drivers/pcap_user.h

View file

diff --git a/arch/um/drivers/pcap_user.h b/arch/um/drivers/pcap_user.h
index d8ba615..1ca7c76 100644
--- a/arch/um/drivers/pcap_user.h
+++ b/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;

arch/um/drivers/port_kern.c

View file

diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 1d83d50..40ca5cc 100644
--- a/arch/um/drivers/port_kern.c
+++ b/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 {

arch/um/drivers/port_user.c

View file

diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 7b010b7..9a8e1b6 100644
--- a/arch/um/drivers/port_user.c
+++ b/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;

arch/um/drivers/pty.c

View file

diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index cff2b75..f1fcc2c 100644
--- a/arch/um/drivers/pty.c
+++ b/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);

arch/um/drivers/random.c

View file

diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index e32c6aa..9e3a722 100644
--- a/arch/um/drivers/random.c
+++ b/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

arch/um/drivers/slip_common.c

View file

diff --git a/arch/um/drivers/slip_common.c b/arch/um/drivers/slip_common.c
index e89cfc6..f597fa7 100644
--- a/arch/um/drivers/slip_common.c
+++ b/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)
 {

arch/um/drivers/slip_kern.c

View file

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index dd2aadc..ed5249f 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/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 {

arch/um/drivers/slip_user.c

View file

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 932b4d6..55c290d 100644
--- a/arch/um/drivers/slip_user.c
+++ b/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)
 {

arch/um/drivers/slirp_kern.c

View file

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index e376284..4ef11ca 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/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 {

arch/um/drivers/slirp_user.c

View file

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index db4adb6..c999d18 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/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)

arch/um/drivers/ssl.c

View file

diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index 7e86f00..16fdd0a 100644
--- a/arch/um/drivers/ssl.c
+++ b/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;

arch/um/drivers/stdio_console.c

View file

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 929b99a..827777a 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/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>