← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apex/trusty

« back to all changes in this revision

Viewing changes to include/asm-arm/types.h

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2009-11-10 11:55:15 UTC
  • mfrom: (2.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091110115515-6jjsf6rc8py35awe
Tags: 1.6.10ubuntu1
* Merge from debian testing, remaining changes:
  - Move apex VMA address to 4MiB to leave enough space for the ubuntu
  kernel and not overwrite apex in ram when loading.
  - nslu2 configuration: set CONFIG_RAMDISK_SIZE=0x0055FFF0 instead of
  0x005FFFF0 to make enough room for ubuntu initramfs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/asm-arm/types.h
1
1
#ifndef __ASM_ARM_TYPES_H
2
2
#define __ASM_ARM_TYPES_H
3
3
 
 
4
#include <asm-generic/int-ll64.h>
 
5
 
4
6
#ifndef __ASSEMBLY__
5
7
 
6
8
typedef unsigned short umode_t;
7
9
 
8
 
/*
9
 
 * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
10
 
 * header files exported to user space
11
 
 */
12
 
 
13
 
typedef __signed__ char __s8;
14
 
typedef unsigned char __u8;
15
 
 
16
 
typedef __signed__ short __s16;
17
 
typedef unsigned short __u16;
18
 
 
19
 
typedef __signed__ int __s32;
20
 
typedef unsigned int __u32;
21
 
 
22
 
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
23
 
typedef __signed__ long long __s64;
24
 
typedef unsigned long long __u64;
25
 
#endif
26
 
 
27
10
#endif /* __ASSEMBLY__ */
28
11
 
29
12
/*
35
18
 
36
19
#ifndef __ASSEMBLY__
37
20
 
38
 
typedef signed char s8;
39
 
typedef unsigned char u8;
40
 
 
41
 
typedef signed short s16;
42
 
typedef unsigned short u16;
43
 
 
44
 
typedef signed int s32;
45
 
typedef unsigned int u32;
46
 
 
47
 
typedef signed long long s64;
48
 
typedef unsigned long long u64;
49
 
 
50
21
/* Dma addresses are 32-bits wide.  */
51
22
 
52
23
typedef u32 dma_addr_t;
53
24
typedef u32 dma64_addr_t;
54
25
 
55
 
typedef unsigned int kmem_bufctl_t;
56
 
 
57
26
#endif /* __ASSEMBLY__ */
58
27
 
59
28
#endif /* __KERNEL__ */