Commit 88e6c020 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs updates from Al Viro:
 "Assorted bits and pieces"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: drop needless assignment in aio_read()
  clean overflow checks in count_mounts() a bit
  seq_file: fix NULL pointer arithmetic warning
  uml/x86: use x86 load_unaligned_zeropad()
  asm/user.h: killed unused macros
  constify struct path argument of finish_automount()/do_add_mount()
  fs: Remove FIXME comment in generic_write_checks()
parents a4251ab9 61e02cdb

arch/alpha/include/asm/user.h

+0 −6
Original line number Diff line number Diff line
@@ -45,10 +45,4 @@ struct user { 
	char		u_comm[32];		/* user command name */

};



#define NBPG			PAGE_SIZE

#define UPAGES			1

#define HOST_TEXT_START_ADDR	(u.start_code)

#define HOST_DATA_START_ADDR	(u.start_data)

#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)



#endif /* _ALPHA_USER_H */

arch/arm/include/asm/user.h

+0 −4
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ struct user{ 
  struct user_fp_struct * u_fp0;/* Used by gdb to help find the values for */

  				/* the FP registers. */

};

#define NBPG PAGE_SIZE

#define UPAGES 1

#define HOST_TEXT_START_ADDR (u.start_code)

#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)



/*

 * User specific VFP registers. If only VFPv2 is present, registers 16 to 31

arch/h8300/include/asm/user.h

+0 −4
Original line number Diff line number Diff line
@@ -67,9 +67,5 @@ struct user { 
	unsigned long magic;		/* To uniquely identify a core file */

	char u_comm[32];		/* User command that was responsible */

};

#define NBPG PAGE_SIZE

#define UPAGES 1

#define HOST_TEXT_START_ADDR (u.start_code)

#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)



#endif

arch/ia64/include/asm/user.h

+0 −6
Original line number Diff line number Diff line
@@ -50,10 +50,4 @@ struct user { 
	char		u_comm[32];		/* user command name */

};



#define NBPG			PAGE_SIZE

#define UPAGES			1

#define HOST_TEXT_START_ADDR	(u.start_code)

#define HOST_DATA_START_ADDR	(u.start_data)

#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)



#endif /* _ASM_IA64_USER_H */

arch/m68k/include/asm/user.h

+0 −4
Original line number Diff line number Diff line
@@ -79,9 +79,5 @@ struct user{ 
  unsigned long magic;		/* To uniquely identify a core file */

  char u_comm[32];		/* User command that was responsible */

};

#define NBPG 4096

#define UPAGES 1

#define HOST_TEXT_START_ADDR (u.start_code)

#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)



#endif