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

Commit e0986756 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes 

* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits)
  Make constants in kernel/timeconst.h fixed 64 bits
  types: add C99-style constructors to <asm-generic/int-*.h>
  xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
  x86: types: use <asm-generic/int-*.h> for the x86 architecture
  v850: types: use <asm-generic/int-*.h> for the v850 architecture
  sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
  sparc: types: use <asm-generic/int-*.h> for the sparc architecture
  sh: types: use <asm-generic/int-*.h> for the sh architecture
  s390: types: use <asm-generic/int-*.h> for the s390 architecture
  powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
  parisc: types: use <asm-generic/int-*.h> for the parisc architecture
  mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
  mips: types: use <asm-generic/int-*.h> for the mips architecture
  m68k: types: use <asm-generic/int-*.h> for the m68k architecture
  m32r: types: use <asm-generic/int-*.h> for the m32r architecture
  ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
  h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
  frv: types: use <asm-generic/int-*.h> for the frv architecture
  cris: types: use <asm-generic/int-*.h> for the cris architecture
  blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
  ...
parents 2905474d b9095fd8

include/asm-alpha/types.h

+1 −35
Original line number Diff line number Diff line
@@ -8,28 +8,12 @@ 
 * not a major issue.  However, for interoperability, libraries still

 * need to be careful to avoid a name clashes.

 */

#include <asm-generic/int-l64.h>



#ifndef __ASSEMBLY__



typedef unsigned int umode_t;



/*

 * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the

 * header files exported to user space

 */



typedef __signed__ char __s8;

typedef unsigned char __u8;



typedef __signed__ short __s16;

typedef unsigned short __u16;



typedef __signed__ int __s32;

typedef unsigned int __u32;



typedef __signed__ long __s64;

typedef unsigned long __u64;



#endif /* __ASSEMBLY__ */



/*
@@ -39,23 +23,5 @@ typedef unsigned long __u64; 


#define BITS_PER_LONG 64



#ifndef __ASSEMBLY__



typedef signed char s8;

typedef unsigned char u8;



typedef signed short s16;

typedef unsigned short u16;



typedef signed int s32;

typedef unsigned int u32;



typedef signed long s64;

typedef unsigned long u64;



typedef u64 dma_addr_t;

typedef u64 dma64_addr_t;



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ALPHA_TYPES_H */

include/asm-arm/types.h

+2 −31
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_TYPES_H

#define __ASM_ARM_TYPES_H



#include <asm-generic/int-ll64.h>



#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

 */



typedef __signed__ char __s8;

typedef unsigned char __u8;



typedef __signed__ short __s16;

typedef unsigned short __u16;



typedef __signed__ int __s32;

typedef unsigned int __u32;



#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*
@@ -35,18 +18,6 @@ __extension__ typedef unsigned long long __u64; 


#ifndef __ASSEMBLY__



typedef signed char s8;

typedef unsigned char u8;



typedef signed short s16;

typedef unsigned short u16;



typedef signed int s32;

typedef unsigned int u32;



typedef signed long long s64;

typedef unsigned long long u64;



/* Dma addresses are 32-bits wide.  */



typedef u32 dma_addr_t;

include/asm-avr32/types.h

+2 −30
Original line number Diff line number Diff line
@@ -8,28 +8,12 @@ 
#ifndef __ASM_AVR32_TYPES_H

#define __ASM_AVR32_TYPES_H



#include <asm-generic/int-ll64.h>



#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

 */

typedef __signed__ char __s8;

typedef unsigned char __u8;



typedef __signed__ short __s16;

typedef unsigned short __u16;



typedef __signed__ int __s32;

typedef unsigned int __u32;



#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*
@@ -41,18 +25,6 @@ __extension__ typedef unsigned long long __u64; 


#ifndef __ASSEMBLY__



typedef signed char s8;

typedef unsigned char u8;



typedef signed short s16;

typedef unsigned short u16;



typedef signed int s32;

typedef unsigned int u32;



typedef signed long long s64;

typedef unsigned long long u64;



/* Dma addresses are 32-bits wide.  */



typedef u32 dma_addr_t;

include/asm-blackfin/types.h

+2 −32
Original line number Diff line number Diff line
@@ -8,30 +8,12 @@ 
 * not a major issue.  However, for interoperability, libraries still

 * need to be careful to avoid a name clashes.

 */

#include <asm-generic/int-ll64.h>



#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

 */



typedef __signed__ char __s8;

typedef unsigned char __u8;



typedef __signed__ short __s16;

typedef unsigned short __u16;



typedef __signed__ int __s32;

typedef unsigned int __u32;



/* HK0617   -- Changes to unsigned long temporarily */

#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif				/* __ASSEMBLY__ */

/*

 * These aren't exported outside the kernel to avoid name space clashes
@@ -42,18 +24,6 @@ __extension__ typedef unsigned long long __u64; 


#ifndef __ASSEMBLY__



typedef signed char s8;

typedef unsigned char u8;



typedef signed short s16;

typedef unsigned short u16;



typedef signed int s32;

typedef unsigned int u32;



typedef signed long long s64;

typedef unsigned long long u64;



/* Dma addresses are 32-bits wide.  */



typedef u32 dma_addr_t;

include/asm-cris/types.h

+2 −31
Original line number Diff line number Diff line 
#ifndef _ETRAX_TYPES_H

#define _ETRAX_TYPES_H



#include <asm-generic/int-ll64.h>



#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

 */



typedef __signed__ char __s8;

typedef unsigned char __u8;



typedef __signed__ short __s16;

typedef unsigned short __u16;



typedef __signed__ int __s32;

typedef unsigned int __u32;



#if defined(__GNUC__)

__extension__ typedef __signed__ long long __s64;

__extension__ typedef unsigned long long __u64;

#endif



#endif /* __ASSEMBLY__ */



/*
@@ -35,18 +18,6 @@ __extension__ typedef unsigned long long __u64; 


#ifndef __ASSEMBLY__



typedef signed char s8;

typedef unsigned char u8;



typedef signed short s16;

typedef unsigned short u16;



typedef signed int s32;

typedef unsigned int u32;



typedef signed long long s64;

typedef unsigned long long u64;



/* Dma addresses are 32-bits wide, just like our other addresses.  */

 

typedef u32 dma_addr_t;