Skip to content

Commit f59b51f

Browse files
torvaldstorvalds
committed
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
2 parents aac2b1f + 062d526 commit f59b51f

File tree

155 files changed

+641
-785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+641
-785
lines changed

‎Documentation/virtual/uml/UserModeLinux-HOWTO.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3591,7 +3591,7 @@
35913591

35923592

35933593
Looking at the source shows that the fault happened during a call to
3594-
copy_to_user to copy the data into the kernel:
3594+
copy_from_user to copy the data into the kernel:
35953595

35963596

35973597
107 count -= chars;

‎arch/um/drivers/chan_kern.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <linux/tty.h>
88
#include <linux/tty_flip.h>
99
#include "chan.h"
10-
#include "os.h"
11-
#include "irq_kern.h"
10+
#include <os.h>
11+
#include <irq_kern.h>
1212

1313
#ifdef CONFIG_NOCONFIG_CHAN
1414
static void *not_configged_init(char *str, int device,

‎arch/um/drivers/chan_user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <termios.h>
1212
#include <sys/ioctl.h>
1313
#include "chan_user.h"
14-
#include "os.h"
15-
#include "um_malloc.h"
14+
#include <os.h>
15+
#include <um_malloc.h>
1616

1717
void generic_close(int fd, void *unused)
1818
{

‎arch/um/drivers/chan_user.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __CHAN_USER_H__
77
#define __CHAN_USER_H__
88

9-
#include "init.h"
9+
#include <init.h>
1010

1111
struct chan_opts {
1212
void (*const announce)(char *dev_name, int dev);

‎arch/um/drivers/cow_sys.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef __COW_SYS_H__
22
#define __COW_SYS_H__
33

4-
#include "kern_util.h"
5-
#include "os.h"
6-
#include "um_malloc.h"
4+
#include <kern_util.h>
5+
#include <os.h>
6+
#include <um_malloc.h>
77

88
static inline void *cow_malloc(int size)
99
{

‎arch/um/drivers/daemon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __DAEMON_H__
77
#define __DAEMON_H__
88

9-
#include "net_user.h"
9+
#include <net_user.h>
1010

1111
#define SWITCH_VERSION 3
1212

‎arch/um/drivers/daemon_kern.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* Licensed under the GPL.
77
*/
88

9-
#include "linux/init.h"
9+
#include <linux/init.h>
1010
#include <linux/netdevice.h>
11-
#include "net_kern.h"
11+
#include <net_kern.h>
1212
#include "daemon.h"
1313

1414
struct daemon_init {

‎arch/um/drivers/daemon_user.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <sys/time.h>
1515
#include <sys/un.h>
1616
#include "daemon.h"
17-
#include "net_user.h"
18-
#include "os.h"
19-
#include "um_malloc.h"
17+
#include <net_user.h>
18+
#include <os.h>
19+
#include <um_malloc.h>
2020

2121
enum request_type { REQ_NEW_CONTROL };
2222

‎arch/um/drivers/fd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <errno.h>
1010
#include <termios.h>
1111
#include "chan_user.h"
12-
#include "os.h"
13-
#include "um_malloc.h"
12+
#include <os.h>
13+
#include <um_malloc.h>
1414

1515
struct fd_chan {
1616
int fd;

‎arch/um/drivers/harddog_user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <stdio.h>
77
#include <unistd.h>
88
#include <errno.h>
9-
#include "os.h"
9+
#include <os.h>
1010

1111
struct dog_data {
1212
int stdin;

0 commit comments

Comments
 (0)