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-versatile/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-versatile/vmalloc.h')
| -rw-r--r-- | include/asm-arm/arch-versatile/vmalloc.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-arm/arch-versatile/vmalloc.h b/include/asm-arm/arch-versatile/vmalloc.h index adfb34829bfc..ac780df62156 100644 --- a/include/asm-arm/arch-versatile/vmalloc.h +++ b/include/asm-arm/arch-versatile/vmalloc.h | |||
| @@ -18,16 +18,4 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | |||
| 22 | /* | ||
| 23 | * Just any arbitrary offset to the start of the vmalloc VM area: the | ||
| 24 | * current 8MB value just means that there will be a 8MB "hole" after the | ||
| 25 | * physical memory until the kernel virtual memory starts. That means that | ||
| 26 | * any out-of-bounds memory accesses will hopefully be caught. | ||
| 27 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced | ||
| 28 | * area for the same reason. ;) | ||
| 29 | */ | ||
| 30 | #define VMALLOC_OFFSET (8*1024*1024) | ||
| 31 | #define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) | ||
| 32 | #define VMALLOC_VMADDR(x) ((unsigned long)(x)) | ||
| 33 | #define VMALLOC_END (PAGE_OFFSET + 0x18000000) | 21 | #define VMALLOC_END (PAGE_OFFSET + 0x18000000) |