Skip to content

Commit 88e6c02

Browse files
torvaldstorvalds
committed
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()
2 parents a4251ab + 61e02cd commit 88e6c02

20 files changed

Lines changed: 18 additions & 96 deletions

File tree

‎arch/alpha/include/asm/user.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,4 @@ struct user {
4545
char u_comm[32]; /* user command name */
4646
};
4747

48-
#define NBPG PAGE_SIZE
49-
#define UPAGES 1
50-
#define HOST_TEXT_START_ADDR (u.start_code)
51-
#define HOST_DATA_START_ADDR (u.start_data)
52-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
53-
5448
#endif /* _ALPHA_USER_H */

‎arch/arm/include/asm/user.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ struct user{
7777
struct user_fp_struct * u_fp0;/* Used by gdb to help find the values for */
7878
/* the FP registers. */
7979
};
80-
#define NBPG PAGE_SIZE
81-
#define UPAGES 1
82-
#define HOST_TEXT_START_ADDR (u.start_code)
83-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
8480

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

‎arch/h8300/include/asm/user.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,5 @@ struct user {
6767
unsigned long magic; /* To uniquely identify a core file */
6868
char u_comm[32]; /* User command that was responsible */
6969
};
70-
#define NBPG PAGE_SIZE
71-
#define UPAGES 1
72-
#define HOST_TEXT_START_ADDR (u.start_code)
73-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
7470

7571
#endif

‎arch/ia64/include/asm/user.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,4 @@ struct user {
5050
char u_comm[32]; /* user command name */
5151
};
5252

53-
#define NBPG PAGE_SIZE
54-
#define UPAGES 1
55-
#define HOST_TEXT_START_ADDR (u.start_code)
56-
#define HOST_DATA_START_ADDR (u.start_data)
57-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
58-
5953
#endif /* _ASM_IA64_USER_H */

‎arch/m68k/include/asm/user.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,5 @@ struct user{
7979
unsigned long magic; /* To uniquely identify a core file */
8080
char u_comm[32]; /* User command that was responsible */
8181
};
82-
#define NBPG 4096
83-
#define UPAGES 1
84-
#define HOST_TEXT_START_ADDR (u.start_code)
85-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
8682

8783
#endif

‎arch/powerpc/include/asm/user.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,4 @@ struct user {
4444
char u_comm[32]; /* user command name */
4545
};
4646

47-
#define NBPG PAGE_SIZE
48-
#define UPAGES 1
49-
#define HOST_TEXT_START_ADDR (u.start_code)
50-
#define HOST_DATA_START_ADDR (u.start_data)
51-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
5247
#endif /* _ASM_POWERPC_USER_H */

‎arch/s390/include/asm/user.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,5 @@ struct user {
6767
unsigned long magic; /* To uniquely identify a core file */
6868
char u_comm[32]; /* User command that was responsible */
6969
};
70-
#define NBPG PAGE_SIZE
71-
#define UPAGES 1
72-
#define HOST_TEXT_START_ADDR (u.start_code)
73-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
7470

7571
#endif /* _S390_USER_H */

‎arch/sh/include/asm/user.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,4 @@ struct user {
5252
char u_comm[32]; /* user command name */
5353
};
5454

55-
#define NBPG PAGE_SIZE
56-
#define UPAGES 1
57-
#define HOST_TEXT_START_ADDR (u.start_code)
58-
#define HOST_DATA_START_ADDR (u.start_data)
59-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
60-
6155
#endif /* __ASM_SH_USER_H */

‎arch/um/include/asm/Kbuild‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ generic-y += softirq_stack.h
2424
generic-y += switch_to.h
2525
generic-y += topology.h
2626
generic-y += trace_clock.h
27-
generic-y += word-at-a-time.h
2827
generic-y += kprobes.h
2928
generic-y += mm_hooks.h
3029
generic-y += vga.h

‎arch/x86/include/asm/user_32.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,5 @@ struct user{
124124
char u_comm[32]; /* User command that was responsible */
125125
int u_debugreg[8];
126126
};
127-
#define NBPG PAGE_SIZE
128-
#define UPAGES 1
129-
#define HOST_TEXT_START_ADDR (u.start_code)
130-
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
131127

132128
#endif /* _ASM_X86_USER_32_H */

0 commit comments

Comments
 (0)