x86: headers fixes
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v1 posting 2/21 patch 1 replyIn review
- v2 Latest4 patches 0 repliesNew
- v1 posting 1/25 patches 3 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | x86: unification of posix_types.harch/ arch/ arch/ +1 more | +85 | 1 reply | |
| 2/4 | x86: asm/unistd.h common for kernel and user spacearch/ | +6 | 0 replies | |
| 3/4 | x86: asm/termios.h remove irrelevant comment for userspacearch/ | +12 | 2 replies | |
| 4/4 | x86: asm/types.h remove irrelevant comment for userspacearch/ | +1 | 1 reply |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [GIT-PULL -tip V2][PATCH 0/4 -tip] x86: headers fixes
Ingo,
Please pull X86 headers fixes patches.
The following changes since commit ce46441b95bcde36649a17d053dc7dc76272f539:
Ingo Molnar (1):
Merge branch 'perfcounters/core'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master
Jaswinder Singh Rajput (4):
x86: unification of posix_types.h
x86: asm/unistd.h common for kernel and user space
x86: asm/termios.h remove irrelevant comment for userspace
x86: asm/types.h remove irrelevant comment for userspace
arch/x86/include/asm/Kbuild | 2 - arch/x86/include/asm/posix_types.h | 96 +++++++++++++++++++++++--- arch/x86/include/asm/posix_types_32.h | 85 ----------------------- arch/x86/include/asm/posix_types_64.h | 119 --------------------------------- arch/x86/include/asm/termios.h | 25 +++---- arch/x86/include/asm/types.h | 3 +- arch/x86/include/asm/unistd.h | 15 ++--- 7 files changed, 104 insertions(+), 241 deletions(-) delete mode 100644 arch/x86/include/asm/posix_types_32.h delete mode 100644 arch/x86/include/asm/posix_types_64.h
Complete diff:
arch/x86/include/asm/Kbuild +0 -2
@@ -16,8 +16,6 @@ unifdef-y += ist.h unifdef-y += mce.h unifdef-y += msr.h unifdef-y += mtrr.h -unifdef-y += posix_types_32.h -unifdef-y += posix_types_64.h unifdef-y += unistd_32.h unifdef-y += unistd_64.h unifdef-y += vm86.h
arch/x86/include/asm/posix_types.h +85 -11
98 lines not on this page · raw message
arch/x86/include/asm/posix_types_32.h deleted +0 -85
85 lines not on this page · raw message
arch/x86/include/asm/posix_types_64.h deleted +0 -119
119 lines not on this page · raw message
arch/x86/include/asm/termios.h +12 -13
@@ -5,20 +5,20 @@#include <asm/ioctls.h> struct winsize { -unsigned short ws_row; -unsigned short ws_col; -unsigned short ws_xpixel; -unsigned short ws_ypixel; +unsigned short ws_row; +unsigned short ws_col; +unsigned short ws_xpixel; +unsigned short ws_ypixel; };#define NCC 8struct termio { -unsigned short c_iflag;/* input mode flags */ -unsigned short c_oflag;/* output mode flags */ -unsigned short c_cflag;/* control mode flags */ -unsigned short c_lflag;/* local mode flags */ -unsigned char c_line;/* line discipline */ -unsigned char c_cc[NCC ];/* control characters */ +unsigned short c_iflag;/* input mode flags */ +unsigned short c_oflag;/* output mode flags */ +unsigned short c_cflag;/* control mode flags */ +unsigned short c_lflag;/* local mode flags */ +unsigned char c_line;/* line discipline */ +unsigned char c_cc[NCC ];/* control characters */ };/* modem lines */
@@ -37,10 +37,10 @@ struct termio {#define TIOCM_OUT2 0x4000#define TIOCM_LOOP 0x8000 -/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -#ifdef __KERNEL__ +/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ +#include <asm/uaccess.h> /* intr=^C quit=^\ erase=del kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u, }#endif /* __KERNEL__ */ -#endif /* _ASM_X86_TERMIOS_H */
arch/x86/include/asm/types.h +1 -2
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;#endif /* __ASSEMBLY__ */ +#ifdef __KERNEL__/* * These aren't exported outside the kernel to avoid name space clashes */ -#ifdef __KERNEL__#ifndef __ASSEMBLY__
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ -#endif /* _ASM_X86_TYPES_H */
arch/x86/include/asm/unistd.h +6 -9
@@ -1,13 +1,10 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 +#ifndef _ASM_X86_UNISTD_H +#define _ASM_X86_UNISTD_H + +# if defined(CONFIG_X86_32 ) || defined(__i386__)# include "unistd_32.h" # else # include "unistd_64.h" # endif -#else -# ifdef __i386__ -# include "unistd_32.h" -# else -# include "unistd_64.h" -# endif -#endif + +#endif /* _ASM_X86_UNISTD_H */