Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59b51fe authored by Linus Torvalds's avatar Linus Torvalds
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
parents aac2b1f5 062d5267

Documentation/virtual/uml/UserModeLinux-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line 
#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)

{