diff options
| author | Len Brown <len.brown@intel.com> | 2004-12-21 07:12:23 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-12-21 07:12:23 -0500 |
| commit | 1c5e7c210e6212e7b9c74b8f3605bae4eabd1dde (patch) | |
| tree | 6f9b822a6ea36e59f5f860ca04691682f2630141 /include | |
| parent | 112e959c5808d7ec51254d208c332d8274c17da8 (diff) | |
| parent | 2954a9c4ce173441b4e48ea1d45efba6ea64f49d (diff) | |
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/map.h | 7 | ||||
| -rw-r--r-- | include/asm-arm/system.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h index 2a75545a2d04..0dbac30ed127 100644 --- a/include/asm-arm/mach/map.h +++ b/include/asm-arm/mach/map.h @@ -21,9 +21,10 @@ struct meminfo; #define MT_DEVICE 0 #define MT_CACHECLEAN 1 #define MT_MINICLEAN 2 -#define MT_VECTORS 3 -#define MT_MEMORY 4 -#define MT_ROM 5 +#define MT_LOW_VECTORS 3 +#define MT_HIGH_VECTORS 4 +#define MT_MEMORY 5 +#define MT_ROM 6 extern void create_memmap_holes(struct meminfo *); extern void memtable_init(struct meminfo *); diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 53cd8d3a08f2..77d0dcf0b713 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -128,9 +128,9 @@ extern unsigned long cr_alignment; /* defined in entry-armv.S */ extern unsigned int user_debug; #if __LINUX_ARM_ARCH__ >= 4 -#define vectors_base() ((cr_alignment & CR_V) ? 0xffff0000 : 0) +#define vectors_high() (cr_alignment & CR_V) #else -#define vectors_base() (0) +#define vectors_high() (0) #endif #define mb() __asm__ __volatile__ ("" : : : "memory") |