diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-arm/arch-iop3xx/vmalloc.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-arm/arch-iop3xx/vmalloc.h')
| -rw-r--r-- | include/asm-arm/arch-iop3xx/vmalloc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-arm/arch-iop3xx/vmalloc.h b/include/asm-arm/arch-iop3xx/vmalloc.h index dc1d2a957164..0f2f6847f93c 100644 --- a/include/asm-arm/arch-iop3xx/vmalloc.h +++ b/include/asm-arm/arch-iop3xx/vmalloc.h | |||
| @@ -10,9 +10,6 @@ | |||
| 10 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced | 10 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced |
| 11 | * area for the same reason. ;) | 11 | * area for the same reason. ;) |
| 12 | */ | 12 | */ |
| 13 | #define VMALLOC_OFFSET (8*1024*1024) | ||
| 14 | #define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) | ||
| 15 | #define VMALLOC_VMADDR(x) ((unsigned long)(x)) | ||
| 16 | //#define VMALLOC_END (0xe8000000) | 13 | //#define VMALLOC_END (0xe8000000) |
| 17 | /* increase usable physical RAM to ~992M per RMK */ | 14 | /* increase usable physical RAM to ~992M per RMK */ |
| 18 | #define VMALLOC_END (0xfe000000) | 15 | #define VMALLOC_END (0xfe000000) |