diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-arm/arch-arc | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-arm/arch-arc')
| -rw-r--r-- | include/asm-arm/arch-arc/memory.h | 6 | ||||
| -rw-r--r-- | include/asm-arm/arch-arc/processor.h | 31 |
2 files changed, 6 insertions, 31 deletions
diff --git a/include/asm-arm/arch-arc/memory.h b/include/asm-arm/arch-arc/memory.h index fb4d819f4..3c21224b5 100644 --- a/include/asm-arm/arch-arc/memory.h +++ b/include/asm-arm/arch-arc/memory.h @@ -22,6 +22,12 @@ #define TASK_SIZE_26 (0x01a00000UL) /* + * This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ +#define TASK_UNMAPPED_BASE (TASK_SIZE / 3) + +/* * Page offset: 32MB */ #define PAGE_OFFSET (0x02000000UL) diff --git a/include/asm-arm/arch-arc/processor.h b/include/asm-arm/arch-arc/processor.h deleted file mode 100644 index 7eea170e3..000000000 --- a/include/asm-arm/arch-arc/processor.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * linux/include/asm-arm/arch-arc/processor.h - * - * Copyright (c) 1996-1999 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Changelog: - * 10-Sep-1996 RMK Created - * 21-Mar-1999 RMK Added asm/arch/memory.h - */ - -#ifndef __ASM_ARCH_PROCESSOR_H -#define __ASM_ARCH_PROCESSOR_H - -/* - * Bus types - */ -#define EISA_bus 0 -#define EISA_bus__is_a_macro /* for versions in ksyms.c */ -#define MCA_bus 0 -#define MCA_bus__is_a_macro /* for versions in ksyms.c */ - -/* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ -#define TASK_UNMAPPED_BASE (TASK_SIZE / 3) - -#endif |