Skip to contentSkip to conversation

move umode_t typedef from asm/types.h to

PATCH Applied Antony Pavlov 2 participants 4 messages Jan 14, 2019 – Jan 16, 2019

Subsystems (6)
Arm (32-bit) x86 MIPS RISC-V +2 more subsystems
lore
Share & tools
lore
#0 lore raw

cover move umode_t typedef from asm/types.h to

This patchseries is marked "for-next" because it contains arch/riscv changes.

Antony Pavlov (2):
MIPS: asm/types.h: drop unused stuff
move umode_t typedef from asm/types.h to linux/types.h

 arch/arm/include/asm/types.h      |  2 --
 arch/blackfin/include/asm/types.h |  2 --
 arch/mips/include/asm/types.h     | 35 -------------------------------
 arch/nios2/include/asm/types.h    |  2 --
 arch/openrisc/include/asm/types.h |  2 --
 arch/ppc/include/asm/types.h      |  2 --
 arch/riscv/include/asm/types.h    |  2 --
 arch/sandbox/include/asm/types.h  |  2 --
 arch/x86/include/asm/types.h      |  2 --
 include/linux/types.h             |  1 +
 10 files changed, 1 insertion(+), 51 deletions(-)
Signature · 7 lines
2.20.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 1/2 MIPS: asm/types.h: drop unused stuff

---
 arch/mips/include/asm/types.h | 29 -----------------------------
 1 file changed, 29 deletions(-)
arch/mips/include/asm/types.h +0 -29
index cd76f53b50..78068e4113 100644
@@ -10,39 +10,10 @@
 
 #include <asm-generic/int-ll64.h>
 
-/*
- * We don't use int-l64.h for the kernel anymore but still use it for
- * userspace to avoid code changes.
- */
-#if (_MIPS_SZLONG == 64) && !defined(__KERNEL__)
-# include <asm-generic/int-l64.h>
-#else
-# include <asm-generic/int-ll64.h>
-#endif
-
 #ifndef __ASSEMBLY__
 
 typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-/*
- * Don't use phys_t.  You've been warned.
- */
-#ifdef CONFIG_64BIT_PHYS_ADDR
-typedef unsigned long long phys_t;
-#else
-typedef unsigned long phys_t;
-#endif
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_TYPES_H */
Signature · 7 lines
2.20.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

PATCH 2/2 move umode_t typedef from asm/types.h to linux/types.h

In reply to Antony Pavlov
---
 arch/arm/include/asm/types.h      | 2 --
 arch/blackfin/include/asm/types.h | 2 --
 arch/mips/include/asm/types.h     | 6 ------
 arch/nios2/include/asm/types.h    | 2 --
 arch/openrisc/include/asm/types.h | 2 --
 arch/ppc/include/asm/types.h      | 2 --
 arch/riscv/include/asm/types.h    | 2 --
 arch/sandbox/include/asm/types.h  | 2 --
 arch/x86/include/asm/types.h      | 2 --
 include/linux/types.h             | 1 +
 10 files changed, 1 insertion(+), 22 deletions(-)
arch/arm/include/asm/types.h +0 -2
index 1a7f47add0..9c21066882 100644
@@ -3,8 +3,6 @@
 
 #ifndef __ASSEMBLY__
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
arch/blackfin/include/asm/types.h +0 -2
index e9d73377eb..086da34d7f 100644
@@ -30,8 +30,6 @@
  */
 #ifndef __ASSEMBLY__
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
arch/mips/include/asm/types.h +0 -6
index 78068e4113..c635c1aac1 100644
@@ -10,10 +10,4 @@
 
 #include <asm-generic/int-ll64.h>
 
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* _ASM_TYPES_H */
arch/nios2/include/asm/types.h +0 -2
index 710ee55796..0067ea83c1 100644
@@ -3,6 +3,4 @@
 
 #include <asm/int-ll64.h>
 
-typedef unsigned short umode_t;
-
 #endif
arch/openrisc/include/asm/types.h +0 -2
index 5b6391baf0..8ee6bb00f9 100644
@@ -24,8 +24,6 @@
  * need to be careful to avoid a name clashes.
  */
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
arch/ppc/include/asm/types.h +0 -2
index 6eb3877032..2d3ce0a283 100644
@@ -3,8 +3,6 @@
 
 #ifndef __ASSEMBLY__
 
-typedef unsigned short umode_t;
-
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
arch/riscv/include/asm/types.h +0 -2
index ba386ab4c5..8200a03349 100644
@@ -15,8 +15,6 @@
 
 #endif
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
arch/sandbox/include/asm/types.h +0 -2
index 501883f5aa..8426de4cc2 100644
@@ -16,8 +16,6 @@
 
 #endif
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
arch/x86/include/asm/types.h +0 -2
index 3caac398d8..e57ae2c8cf 100644
@@ -18,8 +18,6 @@
 
 #endif
 
-typedef unsigned short umode_t;
-
 /*
  * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
  * header files exported to user space
include/linux/types.h +1 -0
index ed3a5b6e81..c19d1dc053 100644
@@ -15,6 +15,7 @@ typedef __kernel_fd_set		fd_set;
 typedef __kernel_dev_t		dev_t;
 typedef __kernel_ino_t		ino_t;
 typedef __kernel_mode_t		mode_t;
+typedef unsigned short		umode_t;
 typedef __kernel_off_t		off_t;
 typedef __kernel_pid_t		pid_t;
 typedef __kernel_daddr_t	daddr_t;
Signature · 7 lines
2.20.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#3 lore raw
In reply to Antony Pavlov
Quoted 6 lines · Antony Pavlov

This patchseries is marked "for-next" because it contains arch/riscv changes.

Antony Pavlov (2):
MIPS: asm/types.h: drop unused stuff
move umode_t typedef from asm/types.h to linux/types.h

Applied, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox