Permalink
Browse files

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
  • Loading branch information...
2 parents aac2b1f + 062d526 commit f59b51fe3d3092c08d7d554ecb40db24011b2ebc @torvalds committed Oct 10, 2012
Showing with 641 additions and 785 deletions.
  1. +1 −1 Documentation/virtual/uml/UserModeLinux-HOWTO.txt
  2. +2 −2 arch/um/drivers/chan_kern.c
  3. +2 −2 arch/um/drivers/chan_user.c
  4. +1 −1 arch/um/drivers/chan_user.h
  5. +3 −3 arch/um/drivers/cow_sys.h
  6. +1 −1 arch/um/drivers/daemon.h
  7. +2 −2 arch/um/drivers/daemon_kern.c
  8. +3 −3 arch/um/drivers/daemon_user.c
  9. +2 −2 arch/um/drivers/fd.c
  10. +1 −1 arch/um/drivers/harddog_user.c
  11. +9 −9 arch/um/drivers/hostaudio_kern.c
  12. +8 −8 arch/um/drivers/line.c
  13. +6 −6 arch/um/drivers/line.h
  14. +1 −1 arch/um/drivers/mconsole.h
  15. +5 −5 arch/um/drivers/mconsole_kern.c
  16. +1 −1 arch/um/drivers/mconsole_kern.h
  17. +1 −1 arch/um/drivers/mmapper_kern.c
  18. +5 −5 arch/um/drivers/net_kern.c
  19. +3 −3 arch/um/drivers/net_user.c
  20. +1 −1 arch/um/drivers/null.c
  21. +2 −2 arch/um/drivers/pcap_kern.c
  22. +2 −2 arch/um/drivers/pcap_user.c
  23. +1 −1 arch/um/drivers/pcap_user.h
  24. +10 −10 arch/um/drivers/port_kern.c
  25. +2 −2 arch/um/drivers/port_user.c
  26. +2 −2 arch/um/drivers/pty.c
  27. +2 −2 arch/um/drivers/random.c
  28. +1 −1 arch/um/drivers/slip_common.c
  29. +1 −1 arch/um/drivers/slip_kern.c
  30. +3 −3 arch/um/drivers/slip_user.c
  31. +3 −3 arch/um/drivers/slirp_kern.c
  32. +2 −2 arch/um/drivers/slirp_user.c
  33. +11 −11 arch/um/drivers/ssl.c
  34. +18 −18 arch/um/drivers/stdio_console.c
  35. +2 −2 arch/um/drivers/tty.c
  36. +4 −4 arch/um/drivers/ubd_kern.c
  37. +1 −1 arch/um/drivers/ubd_user.c
  38. +1 −1 arch/um/drivers/umcast.h
  39. +2 −2 arch/um/drivers/umcast_kern.c
  40. +2 −2 arch/um/drivers/umcast_user.c
  41. +3 −3 arch/um/drivers/vde_kern.c
  42. +2 −2 arch/um/drivers/vde_user.c
  43. +2 −2 arch/um/drivers/xterm.c
  44. +2 −2 arch/um/drivers/xterm_kern.c
  45. +1 −1 arch/um/include/asm/dma.h
  46. +1 −1 arch/um/include/asm/mmu.h
  47. +1 −1 arch/um/include/asm/page.h
  48. +2 −2 arch/um/include/asm/pgtable.h
  49. +3 −3 arch/um/include/asm/processor-generic.h
  50. +1 −1 arch/um/include/asm/ptrace-generic.h
  51. +3 −3 arch/um/include/asm/smp.h
  52. 0 arch/um/include/{shared → asm}/sysrq.h
  53. +1 −1 arch/um/include/shared/arch.h
  54. +1 −1 arch/um/include/shared/as-layout.h
  55. +2 −2 arch/um/include/shared/irq_kern.h
  56. +1 −1 arch/um/include/shared/irq_user.h
  57. +2 −2 arch/um/include/shared/kern_util.h
  58. +2 −2 arch/um/include/shared/longjmp.h
  59. +3 −3 arch/um/include/shared/os.h
  60. +2 −2 arch/um/include/shared/registers.h
  61. +1 −1 arch/um/include/shared/skas/skas.h
  62. +1 −1 arch/um/include/shared/skas_ptrace.h
  63. +1 −1 arch/um/kernel/asm-offsets.c
  64. +1 −1 arch/um/kernel/config.c.in
  65. +1 −1 arch/um/kernel/dyn.lds.S
  66. +1 −1 arch/um/kernel/early_printk.c
  67. +4 −4 arch/um/kernel/exec.c
  68. +1 −1 arch/um/kernel/gmon_syms.c
  69. +1 −1 arch/um/kernel/gprof_syms.c
  70. +6 −6 arch/um/kernel/initrd.c
  71. +11 −11 arch/um/kernel/irq.c
  72. +1 −1 arch/um/kernel/ksyms.c
  73. +6 −6 arch/um/kernel/mem.c
  74. +4 −4 arch/um/kernel/process.c
  75. +7 −7 arch/um/kernel/reboot.c
  76. +3 −3 arch/um/kernel/sigio.c
  77. +2 −2 arch/um/kernel/signal.c
  78. +4 −4 arch/um/kernel/skas/clone.c
  79. +8 −8 arch/um/kernel/skas/mmu.c
  80. +6 −6 arch/um/kernel/skas/process.c
  81. +5 −5 arch/um/kernel/skas/syscall.c
  82. +2 −2 arch/um/kernel/skas/uaccess.c
  83. +15 −15 arch/um/kernel/smp.c
  84. +10 −10 arch/um/kernel/syscall.c
  85. +1 −1 arch/um/kernel/sysrq.c
  86. +2 −2 arch/um/kernel/time.c
  87. +4 −4 arch/um/kernel/tlb.c
  88. +5 −5 arch/um/kernel/trap.c
  89. +7 −7 arch/um/kernel/um_arch.c
  90. +3 −3 arch/um/kernel/umid.c
  91. +1 −1 arch/um/kernel/uml.lds.S
  92. +4 −4 arch/um/os-Linux/aio.c
  93. +1 −1 arch/um/os-Linux/drivers/etap.h
  94. +1 −1 arch/um/os-Linux/drivers/ethertap_kern.c
  95. +3 −3 arch/um/os-Linux/drivers/ethertap_user.c
  96. +1 −1 arch/um/os-Linux/drivers/tuntap.h
  97. +1 −1 arch/um/os-Linux/drivers/tuntap_kern.c
  98. +2 −2 arch/um/os-Linux/drivers/tuntap_user.c
  99. +3 −3 arch/um/os-Linux/elf_aux.c
  100. +2 −2 arch/um/os-Linux/execvp.c
  101. +1 −1 arch/um/os-Linux/file.c
  102. +3 −3 arch/um/os-Linux/helper.c
  103. +3 −3 arch/um/os-Linux/irq.c
  104. +5 −5 arch/um/os-Linux/main.c
  105. +2 −2 arch/um/os-Linux/mem.c
  106. +4 −4 arch/um/os-Linux/process.c
  107. +3 −3 arch/um/os-Linux/registers.c
  108. +5 −5 arch/um/os-Linux/sigio.c
  109. +4 −4 arch/um/os-Linux/signal.c
  110. +10 −10 arch/um/os-Linux/skas/mem.c
  111. +11 −11 arch/um/os-Linux/skas/process.c
  112. +7 −7 arch/um/os-Linux/start_up.c
  113. +2 −2 arch/um/os-Linux/time.c
  114. +2 −2 arch/um/os-Linux/tty.c
  115. +2 −2 arch/um/os-Linux/umid.c
  116. +2 −2 arch/um/os-Linux/user_syms.c
  117. +1 −1 arch/um/os-Linux/util.c
  118. +3 −3 arch/um/sys-ppc/miscthings.c
  119. +1 −1 arch/um/sys-ppc/ptrace.c
  120. +1 −1 arch/um/sys-ppc/ptrace_user.c
  121. +1 −1 arch/um/sys-ppc/shared/sysdep/ptrace.h
  122. +1 −1 arch/um/sys-ppc/sigcontext.c
  123. +2 −2 arch/um/sys-ppc/sysrq.c
  124. +144 −0 arch/x86/um/asm/checksum.h
  125. +0 −140 arch/x86/um/asm/checksum_32.h
  126. +0 −125 arch/x86/um/asm/checksum_64.h
  127. +1 −1 arch/x86/um/asm/elf.h
  128. +54 −4 arch/x86/um/asm/ptrace.h
  129. +0 −28 arch/x86/um/asm/ptrace_32.h
  130. +0 −46 arch/x86/um/asm/ptrace_64.h
  131. +3 −3 arch/x86/um/bugs_32.c
  132. +1 −1 arch/x86/um/bugs_64.c
  133. +1 −1 arch/x86/um/fault.c
  134. +5 −5 arch/x86/um/ldt.c
  135. +3 −3 arch/x86/um/mem_64.c
  136. +2 −2 arch/x86/um/os-Linux/registers.c
  137. +1 −1 arch/x86/um/os-Linux/task_size.c
  138. +1 −1 arch/x86/um/os-Linux/tls.c
  139. +4 −4 arch/x86/um/ptrace_32.c
  140. +1 −1 arch/x86/um/ptrace_user.c
  141. +1 −1 arch/x86/um/shared/sysdep/ptrace.h
  142. +2 −2 arch/x86/um/shared/sysdep/stub.h
  143. +2 −2 arch/x86/um/shared/sysdep/syscalls_32.h
  144. +2 −2 arch/x86/um/signal.c
  145. +1 −1 arch/x86/um/stub_32.S
  146. +1 −1 arch/x86/um/stub_64.S
  147. +3 −3 arch/x86/um/stub_segv.c
  148. +6 −6 arch/x86/um/sysrq_32.c
  149. +1 −1 arch/x86/um/sysrq_64.c
  150. +6 −6 arch/x86/um/tls_32.c
  151. +1 −1 arch/x86/um/tls_64.c
  152. +1 −1 fs/hostfs/hostfs.h
  153. +7 −5 fs/hostfs/hostfs_kern.c
  154. +0 −1 fs/hostfs/hostfs_user.c
  155. +2 −2 fs/hppfs/hppfs.c
@@ -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);
@@ -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)
{
View
@@ -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 };
View
@@ -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;
View
@@ -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
View
@@ -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;
View
@@ -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)
{
View
@@ -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;
View
@@ -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);
View
@@ -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
@@ -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)
{
@@ -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)
{
Oops, something went wrong.

0 comments on commit f59b51f

Please sign in to comment.